From a09821b39e2a55a8a64019f5c5d6cb52c0b2bc04 Mon Sep 17 00:00:00 2001
From: Wei Hu <huwe@microsoft.com>
Date: Fri, 11 Oct 2024 16:29:32 +0800
Subject: [PATCH 1/7] Bump version of MGC

---
 eng/Packages.Data.props                       |    2 +-
 .../test/Common/InputFactory.cs               |    3 +-
 .../BasicTypeSpecClient.RestClient.cs         |  122 +-
 .../src/Generated/BasicTypeSpecClient.cs      |  588 +++---
 .../Generated/BasicTypeSpecClientOptions.cs   |    2 +-
 .../Generated/BasicTypeSpecModelFactory.cs    |  106 +-
 .../Internal/ClientPipelineExtensions.cs      |   36 +-
 .../Generated/Internal/ClientUriBuilder.cs    |   14 +-
 .../src/Generated/Internal/ErrorResult.cs     |    8 +-
 .../Internal/ModelSerializationExtensions.cs  |   62 +-
 .../src/Generated/Internal/Optional.cs        |    4 +-
 .../src/Generated/Internal/TypeFormatters.cs  |    2 +-
 .../AnonymousBodyRequest.Serialization.cs     |  342 ----
 .../Generated/Models/AnonymousBodyRequest.cs  |  129 --
 ...questOptionalLiteralFloat.Serialization.cs |   15 -
 ...nonymousBodyRequestOptionalLiteralFloat.cs |   58 -
 ...RequestOptionalLiteralInt.Serialization.cs |   15 -
 .../AnonymousBodyRequestOptionalLiteralInt.cs |   58 -
 ...onymousBodyRequestOptionalLiteralString.cs |   61 -
 ...questRequiredLiteralFloat.Serialization.cs |   15 -
 ...nonymousBodyRequestRequiredLiteralFloat.cs |   58 -
 ...RequestRequiredLiteralInt.Serialization.cs |   15 -
 .../AnonymousBodyRequestRequiredLiteralInt.cs |   58 -
 ...onymousBodyRequestRequiredLiteralString.cs |   61 -
 .../Generated/Models/FloatExtensibleEnum.cs   |    2 +-
 .../Models/FloatExtensibleEnumWithIntValue.cs |    2 +-
 .../src/Generated/Models/FloatFixedEnum.cs    |    2 +-
 .../Models/FloatFixedEnumWithIntValue.cs      |    2 +-
 .../Generated/Models/Friend.Serialization.cs  |   64 +-
 .../src/Generated/Models/Friend.cs            |    8 +-
 .../FriendlyModelRequest.Serialization.cs     |  147 --
 .../Generated/Models/FriendlyModelRequest.cs  |   33 -
 .../src/Generated/Models/IntExtensibleEnum.cs |    2 +-
 .../src/Generated/Models/IntFixedEnum.cs      |    2 +-
 ...equiredNullableProperties.Serialization.cs |   70 +-
 .../ModelWithRequiredNullableProperties.cs    |   18 +-
 .../Models/ProjectedModel.Serialization.cs    |   64 +-
 .../src/Generated/Models/ProjectedModel.cs    |    8 +-
 ...ProjectedNameModelRequest.Serialization.cs |  147 --
 .../Models/ProjectedNameModelRequest.cs       |   33 -
 ...rnsAnonymousModelResponse.Serialization.cs |   64 +-
 .../Models/ReturnsAnonymousModelResponse.cs   |    4 +-
 .../Models/RoundTripModel.Serialization.cs    |  174 +-
 .../src/Generated/Models/RoundTripModel.cs    |  120 +-
 .../Generated/Models/StringExtensibleEnum.cs  |    2 +-
 .../src/Generated/Models/StringFixedEnum.cs   |    2 +-
 .../Generated/Models/Thing.Serialization.cs   |   88 +-
 .../src/Generated/Models/Thing.cs             |   48 +-
 .../Local/Basic-TypeSpec/tspCodeModel.json    | 1571 +++++------------
 .../http-client-csharp/package-lock.json      |  181 +-
 eng/packages/http-client-csharp/package.json  |    2 +-
 51 files changed, 1401 insertions(+), 3293 deletions(-)
 delete mode 100644 eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequest.Serialization.cs
 delete mode 100644 eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequest.cs
 delete mode 100644 eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestOptionalLiteralFloat.Serialization.cs
 delete mode 100644 eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestOptionalLiteralFloat.cs
 delete mode 100644 eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestOptionalLiteralInt.Serialization.cs
 delete mode 100644 eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestOptionalLiteralInt.cs
 delete mode 100644 eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestOptionalLiteralString.cs
 delete mode 100644 eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestRequiredLiteralFloat.Serialization.cs
 delete mode 100644 eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestRequiredLiteralFloat.cs
 delete mode 100644 eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestRequiredLiteralInt.Serialization.cs
 delete mode 100644 eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestRequiredLiteralInt.cs
 delete mode 100644 eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestRequiredLiteralString.cs
 delete mode 100644 eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FriendlyModelRequest.Serialization.cs
 delete mode 100644 eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FriendlyModelRequest.cs
 delete mode 100644 eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedNameModelRequest.Serialization.cs
 delete mode 100644 eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedNameModelRequest.cs

diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
index 271bbce4e36ca..b0fbdd1809a9f 100644
--- a/eng/Packages.Data.props
+++ b/eng/Packages.Data.props
@@ -243,7 +243,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(IsGeneratorLibrary)' == 'true'">
-    <PackageReference Update="Microsoft.Generator.CSharp.ClientModel" Version="1.0.0-alpha.20240913.1" />
+    <PackageReference Update="Microsoft.Generator.CSharp.ClientModel" Version="1.0.0-alpha.20241010.1" />
   </ItemGroup>
 
   <!--
diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Common/InputFactory.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Common/InputFactory.cs
index e9c2e711a24a8..44618ea85937b 100644
--- a/eng/packages/http-client-csharp/generator/Azure.Generator/test/Common/InputFactory.cs
+++ b/eng/packages/http-client-csharp/generator/Azure.Generator/test/Common/InputFactory.cs
@@ -150,8 +150,7 @@ public static InputModelProperty Property(
                 type,
                 isRequired,
                 isReadOnly,
-                isDiscriminator,
-                null);
+                isDiscriminator);
         }
 
         public static InputModelType Model(
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.RestClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.RestClient.cs
index b8bf3fd176a34..3a79e46349350 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.RestClient.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.RestClient.cs
@@ -14,21 +14,21 @@ namespace BasicTypeSpec
     /// <summary></summary>
     public partial class BasicTypeSpecClient
     {
-        private static PipelineMessageClassifier _pipelineMessageClassifier200;
-        private static PipelineMessageClassifier _pipelineMessageClassifier204;
+        private static System.ClientModel.Primitives.PipelineMessageClassifier _pipelineMessageClassifier200;
+        private static System.ClientModel.Primitives.PipelineMessageClassifier _pipelineMessageClassifier204;
         private static Classifier2xxAnd4xx _pipelineMessageClassifier2xxAnd4xx;
 
-        private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 = PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });
+        private static System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 = System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });
 
-        private static PipelineMessageClassifier PipelineMessageClassifier204 => _pipelineMessageClassifier204 = PipelineMessageClassifier.Create(stackalloc ushort[] { 204 });
+        private static System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier204 => _pipelineMessageClassifier204 = System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 204 });
 
         private static Classifier2xxAnd4xx PipelineMessageClassifier2xxAnd4xx => _pipelineMessageClassifier2xxAnd4xx ??= new Classifier2xxAnd4xx();
 
-        internal PipelineMessage CreateSayHiRequest(string headParameter, string queryParameter, string optionalQuery, RequestOptions options)
+        internal System.ClientModel.Primitives.PipelineMessage CreateSayHiRequest(string headParameter, string queryParameter, string optionalQuery, System.ClientModel.Primitives.RequestOptions options)
         {
-            PipelineMessage message = Pipeline.CreateMessage();
+            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            PipelineRequest request = message.Request;
+            System.ClientModel.Primitives.PipelineRequest request = message.Request;
             request.Method = "GET";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -45,11 +45,11 @@ internal PipelineMessage CreateSayHiRequest(string headParameter, string queryPa
             return message;
         }
 
-        internal PipelineMessage CreateHelloAgainRequest(string p2, string p1, BinaryContent content, RequestOptions options)
+        internal System.ClientModel.Primitives.PipelineMessage CreateHelloAgainRequest(string p2, string p1, System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
-            PipelineMessage message = Pipeline.CreateMessage();
+            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            PipelineRequest request = message.Request;
+            System.ClientModel.Primitives.PipelineRequest request = message.Request;
             request.Method = "GET";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -64,11 +64,11 @@ internal PipelineMessage CreateHelloAgainRequest(string p2, string p1, BinaryCon
             return message;
         }
 
-        internal PipelineMessage CreateNoContentTypeRequest(string p2, string p1, BinaryContent content, RequestOptions options)
+        internal System.ClientModel.Primitives.PipelineMessage CreateNoContentTypeRequest(string p2, string p1, System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
-            PipelineMessage message = Pipeline.CreateMessage();
+            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            PipelineRequest request = message.Request;
+            System.ClientModel.Primitives.PipelineRequest request = message.Request;
             request.Method = "GET";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -83,11 +83,11 @@ internal PipelineMessage CreateNoContentTypeRequest(string p2, string p1, Binary
             return message;
         }
 
-        internal PipelineMessage CreateHelloDemo2Request(RequestOptions options)
+        internal System.ClientModel.Primitives.PipelineMessage CreateHelloDemo2Request(System.ClientModel.Primitives.RequestOptions options)
         {
-            PipelineMessage message = Pipeline.CreateMessage();
+            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            PipelineRequest request = message.Request;
+            System.ClientModel.Primitives.PipelineRequest request = message.Request;
             request.Method = "GET";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -98,11 +98,11 @@ internal PipelineMessage CreateHelloDemo2Request(RequestOptions options)
             return message;
         }
 
-        internal PipelineMessage CreateCreateLiteralRequest(BinaryContent content, RequestOptions options)
+        internal System.ClientModel.Primitives.PipelineMessage CreateCreateLiteralRequest(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
-            PipelineMessage message = Pipeline.CreateMessage();
+            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            PipelineRequest request = message.Request;
+            System.ClientModel.Primitives.PipelineRequest request = message.Request;
             request.Method = "POST";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -115,11 +115,11 @@ internal PipelineMessage CreateCreateLiteralRequest(BinaryContent content, Reque
             return message;
         }
 
-        internal PipelineMessage CreateHelloLiteralRequest(RequestOptions options)
+        internal System.ClientModel.Primitives.PipelineMessage CreateHelloLiteralRequest(System.ClientModel.Primitives.RequestOptions options)
         {
-            PipelineMessage message = Pipeline.CreateMessage();
+            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            PipelineRequest request = message.Request;
+            System.ClientModel.Primitives.PipelineRequest request = message.Request;
             request.Method = "GET";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -133,11 +133,11 @@ internal PipelineMessage CreateHelloLiteralRequest(RequestOptions options)
             return message;
         }
 
-        internal PipelineMessage CreateTopActionRequest(DateTimeOffset action, RequestOptions options)
+        internal System.ClientModel.Primitives.PipelineMessage CreateTopActionRequest(DateTimeOffset action, System.ClientModel.Primitives.RequestOptions options)
         {
-            PipelineMessage message = Pipeline.CreateMessage();
+            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            PipelineRequest request = message.Request;
+            System.ClientModel.Primitives.PipelineRequest request = message.Request;
             request.Method = "GET";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -149,11 +149,11 @@ internal PipelineMessage CreateTopActionRequest(DateTimeOffset action, RequestOp
             return message;
         }
 
-        internal PipelineMessage CreateTopAction2Request(RequestOptions options)
+        internal System.ClientModel.Primitives.PipelineMessage CreateTopAction2Request(System.ClientModel.Primitives.RequestOptions options)
         {
-            PipelineMessage message = Pipeline.CreateMessage();
+            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            PipelineRequest request = message.Request;
+            System.ClientModel.Primitives.PipelineRequest request = message.Request;
             request.Method = "GET";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -164,11 +164,11 @@ internal PipelineMessage CreateTopAction2Request(RequestOptions options)
             return message;
         }
 
-        internal PipelineMessage CreatePatchActionRequest(BinaryContent content, RequestOptions options)
+        internal System.ClientModel.Primitives.PipelineMessage CreatePatchActionRequest(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
-            PipelineMessage message = Pipeline.CreateMessage();
+            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            PipelineRequest request = message.Request;
+            System.ClientModel.Primitives.PipelineRequest request = message.Request;
             request.Method = "PATCH";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -181,11 +181,11 @@ internal PipelineMessage CreatePatchActionRequest(BinaryContent content, Request
             return message;
         }
 
-        internal PipelineMessage CreateAnonymousBodyRequest(BinaryContent content, RequestOptions options)
+        internal System.ClientModel.Primitives.PipelineMessage CreateAnonymousBodyRequest(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
-            PipelineMessage message = Pipeline.CreateMessage();
+            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            PipelineRequest request = message.Request;
+            System.ClientModel.Primitives.PipelineRequest request = message.Request;
             request.Method = "POST";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -198,11 +198,11 @@ internal PipelineMessage CreateAnonymousBodyRequest(BinaryContent content, Reque
             return message;
         }
 
-        internal PipelineMessage CreateFriendlyModelRequest(BinaryContent content, RequestOptions options)
+        internal System.ClientModel.Primitives.PipelineMessage CreateFriendlyModelRequest(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
-            PipelineMessage message = Pipeline.CreateMessage();
+            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            PipelineRequest request = message.Request;
+            System.ClientModel.Primitives.PipelineRequest request = message.Request;
             request.Method = "POST";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -215,11 +215,11 @@ internal PipelineMessage CreateFriendlyModelRequest(BinaryContent content, Reque
             return message;
         }
 
-        internal PipelineMessage CreateAddTimeHeaderRequest(RequestOptions options)
+        internal System.ClientModel.Primitives.PipelineMessage CreateAddTimeHeaderRequest(System.ClientModel.Primitives.RequestOptions options)
         {
-            PipelineMessage message = Pipeline.CreateMessage();
+            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier204;
-            PipelineRequest request = message.Request;
+            System.ClientModel.Primitives.PipelineRequest request = message.Request;
             request.Method = "GET";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -230,11 +230,11 @@ internal PipelineMessage CreateAddTimeHeaderRequest(RequestOptions options)
             return message;
         }
 
-        internal PipelineMessage CreateProjectedNameModelRequest(BinaryContent content, RequestOptions options)
+        internal System.ClientModel.Primitives.PipelineMessage CreateProjectedNameModelRequest(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
-            PipelineMessage message = Pipeline.CreateMessage();
+            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            PipelineRequest request = message.Request;
+            System.ClientModel.Primitives.PipelineRequest request = message.Request;
             request.Method = "POST";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -247,11 +247,11 @@ internal PipelineMessage CreateProjectedNameModelRequest(BinaryContent content,
             return message;
         }
 
-        internal PipelineMessage CreateReturnsAnonymousModelRequest(RequestOptions options)
+        internal System.ClientModel.Primitives.PipelineMessage CreateReturnsAnonymousModelRequest(System.ClientModel.Primitives.RequestOptions options)
         {
-            PipelineMessage message = Pipeline.CreateMessage();
+            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            PipelineRequest request = message.Request;
+            System.ClientModel.Primitives.PipelineRequest request = message.Request;
             request.Method = "POST";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -262,11 +262,11 @@ internal PipelineMessage CreateReturnsAnonymousModelRequest(RequestOptions optio
             return message;
         }
 
-        internal PipelineMessage CreateGetUnknownValueRequest(string accept, RequestOptions options)
+        internal System.ClientModel.Primitives.PipelineMessage CreateGetUnknownValueRequest(string accept, System.ClientModel.Primitives.RequestOptions options)
         {
-            PipelineMessage message = Pipeline.CreateMessage();
+            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            PipelineRequest request = message.Request;
+            System.ClientModel.Primitives.PipelineRequest request = message.Request;
             request.Method = "GET";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -277,11 +277,11 @@ internal PipelineMessage CreateGetUnknownValueRequest(string accept, RequestOpti
             return message;
         }
 
-        internal PipelineMessage CreateInternalProtocolRequest(BinaryContent content, RequestOptions options)
+        internal System.ClientModel.Primitives.PipelineMessage CreateInternalProtocolRequest(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
-            PipelineMessage message = Pipeline.CreateMessage();
+            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            PipelineRequest request = message.Request;
+            System.ClientModel.Primitives.PipelineRequest request = message.Request;
             request.Method = "POST";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -294,11 +294,11 @@ internal PipelineMessage CreateInternalProtocolRequest(BinaryContent content, Re
             return message;
         }
 
-        internal PipelineMessage CreateStillConvenientRequest(RequestOptions options)
+        internal System.ClientModel.Primitives.PipelineMessage CreateStillConvenientRequest(System.ClientModel.Primitives.RequestOptions options)
         {
-            PipelineMessage message = Pipeline.CreateMessage();
+            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier204;
-            PipelineRequest request = message.Request;
+            System.ClientModel.Primitives.PipelineRequest request = message.Request;
             request.Method = "GET";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -308,11 +308,11 @@ internal PipelineMessage CreateStillConvenientRequest(RequestOptions options)
             return message;
         }
 
-        internal PipelineMessage CreateHeadAsBooleanRequest(string id, RequestOptions options)
+        internal System.ClientModel.Primitives.PipelineMessage CreateHeadAsBooleanRequest(string id, System.ClientModel.Primitives.RequestOptions options)
         {
-            PipelineMessage message = Pipeline.CreateMessage();
+            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier2xxAnd4xx;
-            PipelineRequest request = message.Request;
+            System.ClientModel.Primitives.PipelineRequest request = message.Request;
             request.Method = "HEAD";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -323,9 +323,9 @@ internal PipelineMessage CreateHeadAsBooleanRequest(string id, RequestOptions op
             return message;
         }
 
-        private class Classifier2xxAnd4xx : PipelineMessageClassifier
+        private class Classifier2xxAnd4xx : System.ClientModel.Primitives.PipelineMessageClassifier
         {
-            public override bool TryClassify(PipelineMessage message, out bool isError)
+            public override bool TryClassify(System.ClientModel.Primitives.PipelineMessage message, out bool isError)
             {
                 isError = false;
                 if (message.Response == null)
@@ -341,7 +341,7 @@ public override bool TryClassify(PipelineMessage message, out bool isError)
                 return true;
             }
 
-            public override bool TryClassify(PipelineMessage message, Exception exception, out bool isRetryable)
+            public override bool TryClassify(System.ClientModel.Primitives.PipelineMessage message, Exception exception, out bool isRetryable)
             {
                 isRetryable = false;
                 return false;
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.cs
index c05199299e5d1..3df626196d507 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.cs
@@ -18,10 +18,10 @@ namespace BasicTypeSpec
     /// <summary></summary>
     public partial class BasicTypeSpecClient
     {
-        private readonly Uri _endpoint;
+        private readonly System.Uri _endpoint;
         private const string AuthorizationHeader = "my-api-key";
         /// <summary> A credential used to authenticate to the service. </summary>
-        private readonly ApiKeyCredential _keyCredential;
+        private readonly System.ClientModel.ApiKeyCredential _keyCredential;
 
         /// <summary> Initializes a new instance of BasicTypeSpecClient for mocking. </summary>
         protected BasicTypeSpecClient()
@@ -32,7 +32,7 @@ protected BasicTypeSpecClient()
         /// <param name="endpoint"> Service endpoint. </param>
         /// <param name="keyCredential"> A credential used to authenticate to the service. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="endpoint"/> or <paramref name="keyCredential"/> is null. </exception>
-        public BasicTypeSpecClient(Uri endpoint, ApiKeyCredential keyCredential) : this(endpoint, keyCredential, new BasicTypeSpecClientOptions())
+        public BasicTypeSpecClient(System.Uri endpoint, System.ClientModel.ApiKeyCredential keyCredential) : this(endpoint, keyCredential, new BasicTypeSpecClientOptions())
         {
         }
 
@@ -41,7 +41,7 @@ protected BasicTypeSpecClient()
         /// <param name="keyCredential"> A credential used to authenticate to the service. </param>
         /// <param name="options"> The options for configuring the client. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="endpoint"/> or <paramref name="keyCredential"/> is null. </exception>
-        public BasicTypeSpecClient(Uri endpoint, ApiKeyCredential keyCredential, BasicTypeSpecClientOptions options)
+        public BasicTypeSpecClient(System.Uri endpoint, System.ClientModel.ApiKeyCredential keyCredential, BasicTypeSpecClientOptions options)
         {
             Argument.AssertNotNull(endpoint, nameof(endpoint));
             Argument.AssertNotNull(keyCredential, nameof(keyCredential));
@@ -50,11 +50,11 @@ public BasicTypeSpecClient(Uri endpoint, ApiKeyCredential keyCredential, BasicTy
 
             _endpoint = endpoint;
             _keyCredential = keyCredential;
-            Pipeline = ClientPipeline.Create(options, Array.Empty<PipelinePolicy>(), new PipelinePolicy[] { ApiKeyAuthenticationPolicy.CreateHeaderApiKeyPolicy(_keyCredential, AuthorizationHeader) }, Array.Empty<PipelinePolicy>());
+            Pipeline = System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty<System.ClientModel.Primitives.PipelinePolicy>(), new System.ClientModel.Primitives.PipelinePolicy[] { System.ClientModel.Primitives.ApiKeyAuthenticationPolicy.CreateHeaderApiKeyPolicy(_keyCredential, AuthorizationHeader) }, Array.Empty<System.ClientModel.Primitives.PipelinePolicy>());
         }
 
         /// <summary> The HTTP pipeline for sending and receiving REST requests and responses. </summary>
-        public ClientPipeline Pipeline { get; }
+        public System.ClientModel.Primitives.ClientPipeline Pipeline { get; }
 
         /// <summary>
         /// [Protocol Method] Return hi
@@ -69,15 +69,15 @@ public BasicTypeSpecClient(Uri endpoint, ApiKeyCredential keyCredential, BasicTy
         /// <param name="optionalQuery"></param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="headParameter"/> or <paramref name="queryParameter"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual ClientResult SayHi(string headParameter, string queryParameter, string optionalQuery, RequestOptions options)
+        public virtual System.ClientModel.ClientResult SayHi(string headParameter, string queryParameter, string optionalQuery, System.ClientModel.Primitives.RequestOptions options)
         {
             Argument.AssertNotNull(headParameter, nameof(headParameter));
             Argument.AssertNotNull(queryParameter, nameof(queryParameter));
 
-            using PipelineMessage message = CreateSayHiRequest(headParameter, queryParameter, optionalQuery, options);
-            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateSayHiRequest(headParameter, queryParameter, optionalQuery, options);
+            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -93,15 +93,15 @@ public virtual ClientResult SayHi(string headParameter, string queryParameter, s
         /// <param name="optionalQuery"></param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="headParameter"/> or <paramref name="queryParameter"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<ClientResult> SayHiAsync(string headParameter, string queryParameter, string optionalQuery, RequestOptions options)
+        public virtual async Task<System.ClientModel.ClientResult> SayHiAsync(string headParameter, string queryParameter, string optionalQuery, System.ClientModel.Primitives.RequestOptions options)
         {
             Argument.AssertNotNull(headParameter, nameof(headParameter));
             Argument.AssertNotNull(queryParameter, nameof(queryParameter));
 
-            using PipelineMessage message = CreateSayHiRequest(headParameter, queryParameter, optionalQuery, options);
-            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateSayHiRequest(headParameter, queryParameter, optionalQuery, options);
+            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> Return hi. </summary>
@@ -109,14 +109,14 @@ public virtual async Task<ClientResult> SayHiAsync(string headParameter, string
         /// <param name="queryParameter"></param>
         /// <param name="optionalQuery"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="headParameter"/> or <paramref name="queryParameter"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual ClientResult<Thing> SayHi(string headParameter, string queryParameter, string optionalQuery)
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual System.ClientModel.ClientResult<Thing> SayHi(string headParameter, string queryParameter, string optionalQuery)
         {
             Argument.AssertNotNull(headParameter, nameof(headParameter));
             Argument.AssertNotNull(queryParameter, nameof(queryParameter));
 
-            ClientResult result = SayHi(headParameter, queryParameter, optionalQuery, null);
-            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            System.ClientModel.ClientResult result = SayHi(headParameter, queryParameter, optionalQuery, null);
+            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary> Return hi. </summary>
@@ -124,14 +124,14 @@ public virtual ClientResult<Thing> SayHi(string headParameter, string queryParam
         /// <param name="queryParameter"></param>
         /// <param name="optionalQuery"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="headParameter"/> or <paramref name="queryParameter"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<ClientResult<Thing>> SayHiAsync(string headParameter, string queryParameter, string optionalQuery)
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<System.ClientModel.ClientResult<Thing>> SayHiAsync(string headParameter, string queryParameter, string optionalQuery)
         {
             Argument.AssertNotNull(headParameter, nameof(headParameter));
             Argument.AssertNotNull(queryParameter, nameof(queryParameter));
 
-            ClientResult result = await SayHiAsync(headParameter, queryParameter, optionalQuery, null).ConfigureAwait(false);
-            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            System.ClientModel.ClientResult result = await SayHiAsync(headParameter, queryParameter, optionalQuery, null).ConfigureAwait(false);
+            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary>
@@ -147,16 +147,16 @@ public virtual async Task<ClientResult<Thing>> SayHiAsync(string headParameter,
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="p2"/>, <paramref name="p1"/> or <paramref name="content"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual ClientResult HelloAgain(string p2, string p1, BinaryContent content, RequestOptions options)
+        public virtual System.ClientModel.ClientResult HelloAgain(string p2, string p1, System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
             Argument.AssertNotNull(p2, nameof(p2));
             Argument.AssertNotNull(p1, nameof(p1));
             Argument.AssertNotNull(content, nameof(content));
 
-            using PipelineMessage message = CreateHelloAgainRequest(p2, p1, content, options);
-            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateHelloAgainRequest(p2, p1, content, options);
+            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -172,16 +172,16 @@ public virtual ClientResult HelloAgain(string p2, string p1, BinaryContent conte
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="p2"/>, <paramref name="p1"/> or <paramref name="content"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<ClientResult> HelloAgainAsync(string p2, string p1, BinaryContent content, RequestOptions options)
+        public virtual async Task<System.ClientModel.ClientResult> HelloAgainAsync(string p2, string p1, System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
             Argument.AssertNotNull(p2, nameof(p2));
             Argument.AssertNotNull(p1, nameof(p1));
             Argument.AssertNotNull(content, nameof(content));
 
-            using PipelineMessage message = CreateHelloAgainRequest(p2, p1, content, options);
-            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateHelloAgainRequest(p2, p1, content, options);
+            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> Return hi again. </summary>
@@ -189,15 +189,15 @@ public virtual async Task<ClientResult> HelloAgainAsync(string p2, string p1, Bi
         /// <param name="p1"></param>
         /// <param name="action"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="p2"/>, <paramref name="p1"/> or <paramref name="action"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual ClientResult<RoundTripModel> HelloAgain(string p2, string p1, RoundTripModel action)
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual System.ClientModel.ClientResult<RoundTripModel> HelloAgain(string p2, string p1, RoundTripModel action)
         {
             Argument.AssertNotNull(p2, nameof(p2));
             Argument.AssertNotNull(p1, nameof(p1));
             Argument.AssertNotNull(action, nameof(action));
 
-            ClientResult result = HelloAgain(p2, p1, action, null);
-            return ClientResult.FromValue((RoundTripModel)result, result.GetRawResponse());
+            System.ClientModel.ClientResult result = this.HelloAgain(p2, p1, action, null);
+            return System.ClientModel.ClientResult.FromValue((RoundTripModel)result, result.GetRawResponse());
         }
 
         /// <summary> Return hi again. </summary>
@@ -205,15 +205,15 @@ public virtual ClientResult<RoundTripModel> HelloAgain(string p2, string p1, Rou
         /// <param name="p1"></param>
         /// <param name="action"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="p2"/>, <paramref name="p1"/> or <paramref name="action"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<ClientResult<RoundTripModel>> HelloAgainAsync(string p2, string p1, RoundTripModel action)
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<System.ClientModel.ClientResult<RoundTripModel>> HelloAgainAsync(string p2, string p1, RoundTripModel action)
         {
             Argument.AssertNotNull(p2, nameof(p2));
             Argument.AssertNotNull(p1, nameof(p1));
             Argument.AssertNotNull(action, nameof(action));
 
-            ClientResult result = await HelloAgainAsync(p2, p1, action, null).ConfigureAwait(false);
-            return ClientResult.FromValue((RoundTripModel)result, result.GetRawResponse());
+            System.ClientModel.ClientResult result = await this.HelloAgainAsync(p2, p1, action, null).ConfigureAwait(false);
+            return System.ClientModel.ClientResult.FromValue((RoundTripModel)result, result.GetRawResponse());
         }
 
         /// <summary>
@@ -229,16 +229,16 @@ public virtual async Task<ClientResult<RoundTripModel>> HelloAgainAsync(string p
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="p2"/>, <paramref name="p1"/> or <paramref name="content"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual ClientResult NoContentType(string p2, string p1, BinaryContent content, RequestOptions options)
+        public virtual System.ClientModel.ClientResult NoContentType(string p2, string p1, System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
             Argument.AssertNotNull(p2, nameof(p2));
             Argument.AssertNotNull(p1, nameof(p1));
             Argument.AssertNotNull(content, nameof(content));
 
-            using PipelineMessage message = CreateNoContentTypeRequest(p2, p1, content, options);
-            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateNoContentTypeRequest(p2, p1, content, options);
+            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -254,16 +254,16 @@ public virtual ClientResult NoContentType(string p2, string p1, BinaryContent co
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="p2"/>, <paramref name="p1"/> or <paramref name="content"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<ClientResult> NoContentTypeAsync(string p2, string p1, BinaryContent content, RequestOptions options)
+        public virtual async Task<System.ClientModel.ClientResult> NoContentTypeAsync(string p2, string p1, System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
             Argument.AssertNotNull(p2, nameof(p2));
             Argument.AssertNotNull(p1, nameof(p1));
             Argument.AssertNotNull(content, nameof(content));
 
-            using PipelineMessage message = CreateNoContentTypeRequest(p2, p1, content, options);
-            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateNoContentTypeRequest(p2, p1, content, options);
+            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary>
@@ -275,12 +275,12 @@ public virtual async Task<ClientResult> NoContentTypeAsync(string p2, string p1,
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual ClientResult HelloDemo2(RequestOptions options)
+        public virtual System.ClientModel.ClientResult HelloDemo2(System.ClientModel.Primitives.RequestOptions options)
         {
-            using PipelineMessage message = CreateHelloDemo2Request(options);
-            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateHelloDemo2Request(options);
+            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -292,28 +292,28 @@ public virtual ClientResult HelloDemo2(RequestOptions options)
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<ClientResult> HelloDemo2Async(RequestOptions options)
+        public virtual async Task<System.ClientModel.ClientResult> HelloDemo2Async(System.ClientModel.Primitives.RequestOptions options)
         {
-            using PipelineMessage message = CreateHelloDemo2Request(options);
-            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateHelloDemo2Request(options);
+            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> Return hi in demo2. </summary>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual ClientResult<Thing> HelloDemo2()
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual System.ClientModel.ClientResult<Thing> HelloDemo2()
         {
-            ClientResult result = HelloDemo2(null);
-            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            System.ClientModel.ClientResult result = HelloDemo2(null);
+            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary> Return hi in demo2. </summary>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<ClientResult<Thing>> HelloDemo2Async()
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<System.ClientModel.ClientResult<Thing>> HelloDemo2Async()
         {
-            ClientResult result = await HelloDemo2Async(null).ConfigureAwait(false);
-            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            System.ClientModel.ClientResult result = await HelloDemo2Async(null).ConfigureAwait(false);
+            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary>
@@ -327,14 +327,14 @@ public virtual async Task<ClientResult<Thing>> HelloDemo2Async()
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual ClientResult CreateLiteral(BinaryContent content, RequestOptions options)
+        public virtual System.ClientModel.ClientResult CreateLiteral(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using PipelineMessage message = CreateCreateLiteralRequest(content, options);
-            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateCreateLiteralRequest(content, options);
+            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -348,38 +348,38 @@ public virtual ClientResult CreateLiteral(BinaryContent content, RequestOptions
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<ClientResult> CreateLiteralAsync(BinaryContent content, RequestOptions options)
+        public virtual async Task<System.ClientModel.ClientResult> CreateLiteralAsync(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using PipelineMessage message = CreateCreateLiteralRequest(content, options);
-            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateCreateLiteralRequest(content, options);
+            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> Create with literal value. </summary>
         /// <param name="body"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual ClientResult<Thing> CreateLiteral(Thing body)
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual System.ClientModel.ClientResult<Thing> CreateLiteral(Thing body)
         {
             Argument.AssertNotNull(body, nameof(body));
 
-            ClientResult result = CreateLiteral(body, null);
-            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            System.ClientModel.ClientResult result = this.CreateLiteral(body, null);
+            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary> Create with literal value. </summary>
         /// <param name="body"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<ClientResult<Thing>> CreateLiteralAsync(Thing body)
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<System.ClientModel.ClientResult<Thing>> CreateLiteralAsync(Thing body)
         {
             Argument.AssertNotNull(body, nameof(body));
 
-            ClientResult result = await CreateLiteralAsync(body, null).ConfigureAwait(false);
-            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            System.ClientModel.ClientResult result = await this.CreateLiteralAsync(body, null).ConfigureAwait(false);
+            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary>
@@ -391,12 +391,12 @@ public virtual async Task<ClientResult<Thing>> CreateLiteralAsync(Thing body)
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual ClientResult HelloLiteral(RequestOptions options)
+        public virtual System.ClientModel.ClientResult HelloLiteral(System.ClientModel.Primitives.RequestOptions options)
         {
-            using PipelineMessage message = CreateHelloLiteralRequest(options);
-            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateHelloLiteralRequest(options);
+            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -408,28 +408,28 @@ public virtual ClientResult HelloLiteral(RequestOptions options)
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<ClientResult> HelloLiteralAsync(RequestOptions options)
+        public virtual async Task<System.ClientModel.ClientResult> HelloLiteralAsync(System.ClientModel.Primitives.RequestOptions options)
         {
-            using PipelineMessage message = CreateHelloLiteralRequest(options);
-            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateHelloLiteralRequest(options);
+            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> Send literal parameters. </summary>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual ClientResult<Thing> HelloLiteral()
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual System.ClientModel.ClientResult<Thing> HelloLiteral()
         {
-            ClientResult result = HelloLiteral(null);
-            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            System.ClientModel.ClientResult result = HelloLiteral(null);
+            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary> Send literal parameters. </summary>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<ClientResult<Thing>> HelloLiteralAsync()
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<System.ClientModel.ClientResult<Thing>> HelloLiteralAsync()
         {
-            ClientResult result = await HelloLiteralAsync(null).ConfigureAwait(false);
-            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            System.ClientModel.ClientResult result = await HelloLiteralAsync(null).ConfigureAwait(false);
+            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary>
@@ -442,12 +442,12 @@ public virtual async Task<ClientResult<Thing>> HelloLiteralAsync()
         /// </summary>
         /// <param name="action"></param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual ClientResult TopAction(DateTimeOffset action, RequestOptions options)
+        public virtual System.ClientModel.ClientResult TopAction(DateTimeOffset action, System.ClientModel.Primitives.RequestOptions options)
         {
-            using PipelineMessage message = CreateTopActionRequest(action, options);
-            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateTopActionRequest(action, options);
+            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -460,30 +460,30 @@ public virtual ClientResult TopAction(DateTimeOffset action, RequestOptions opti
         /// </summary>
         /// <param name="action"></param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<ClientResult> TopActionAsync(DateTimeOffset action, RequestOptions options)
+        public virtual async Task<System.ClientModel.ClientResult> TopActionAsync(DateTimeOffset action, System.ClientModel.Primitives.RequestOptions options)
         {
-            using PipelineMessage message = CreateTopActionRequest(action, options);
-            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateTopActionRequest(action, options);
+            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> top level method. </summary>
         /// <param name="action"></param>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual ClientResult<Thing> TopAction(DateTimeOffset action)
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual System.ClientModel.ClientResult<Thing> TopAction(DateTimeOffset action)
         {
-            ClientResult result = TopAction(action, null);
-            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            System.ClientModel.ClientResult result = TopAction(action, null);
+            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary> top level method. </summary>
         /// <param name="action"></param>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<ClientResult<Thing>> TopActionAsync(DateTimeOffset action)
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<System.ClientModel.ClientResult<Thing>> TopActionAsync(DateTimeOffset action)
         {
-            ClientResult result = await TopActionAsync(action, null).ConfigureAwait(false);
-            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            System.ClientModel.ClientResult result = await TopActionAsync(action, null).ConfigureAwait(false);
+            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary>
@@ -495,12 +495,12 @@ public virtual async Task<ClientResult<Thing>> TopActionAsync(DateTimeOffset act
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual ClientResult TopAction2(RequestOptions options)
+        public virtual System.ClientModel.ClientResult TopAction2(System.ClientModel.Primitives.RequestOptions options)
         {
-            using PipelineMessage message = CreateTopAction2Request(options);
-            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateTopAction2Request(options);
+            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -512,12 +512,12 @@ public virtual ClientResult TopAction2(RequestOptions options)
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<ClientResult> TopAction2Async(RequestOptions options)
+        public virtual async Task<System.ClientModel.ClientResult> TopAction2Async(System.ClientModel.Primitives.RequestOptions options)
         {
-            using PipelineMessage message = CreateTopAction2Request(options);
-            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateTopAction2Request(options);
+            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary>
@@ -531,14 +531,14 @@ public virtual async Task<ClientResult> TopAction2Async(RequestOptions options)
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual ClientResult PatchAction(BinaryContent content, RequestOptions options)
+        public virtual System.ClientModel.ClientResult PatchAction(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using PipelineMessage message = CreatePatchActionRequest(content, options);
-            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using System.ClientModel.Primitives.PipelineMessage message = CreatePatchActionRequest(content, options);
+            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -552,14 +552,14 @@ public virtual ClientResult PatchAction(BinaryContent content, RequestOptions op
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<ClientResult> PatchActionAsync(BinaryContent content, RequestOptions options)
+        public virtual async Task<System.ClientModel.ClientResult> PatchActionAsync(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using PipelineMessage message = CreatePatchActionRequest(content, options);
-            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using System.ClientModel.Primitives.PipelineMessage message = CreatePatchActionRequest(content, options);
+            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary>
@@ -573,14 +573,14 @@ public virtual async Task<ClientResult> PatchActionAsync(BinaryContent content,
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual ClientResult AnonymousBody(BinaryContent content, RequestOptions options)
+        public virtual System.ClientModel.ClientResult AnonymousBody(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using PipelineMessage message = CreateAnonymousBodyRequest(content, options);
-            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateAnonymousBodyRequest(content, options);
+            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -594,39 +594,39 @@ public virtual ClientResult AnonymousBody(BinaryContent content, RequestOptions
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<ClientResult> AnonymousBodyAsync(BinaryContent content, RequestOptions options)
+        public virtual async Task<System.ClientModel.ClientResult> AnonymousBodyAsync(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using PipelineMessage message = CreateAnonymousBodyRequest(content, options);
-            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateAnonymousBodyRequest(content, options);
+            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> body parameter without body decorator. </summary>
-        /// <param name="name"> name of the Thing. </param>
-        /// <param name="requiredUnion"> required Union. </param>
-        /// <param name="requiredLiteralString"> required literal string. </param>
-        /// <param name="requiredLiteralInt"> required literal int. </param>
-        /// <param name="requiredLiteralFloat"> required literal float. </param>
-        /// <param name="requiredLiteralBool"> required literal bool. </param>
-        /// <param name="requiredBadDescription"> description with xml &lt;|endoftext|&gt;. </param>
-        /// <param name="requiredNullableList"> required nullable collection. </param>
-        /// <param name="optionalLiteralString"> optional literal string. </param>
-        /// <param name="optionalLiteralInt"> optional literal int. </param>
-        /// <param name="optionalLiteralFloat"> optional literal float. </param>
-        /// <param name="optionalLiteralBool"> optional literal bool. </param>
-        /// <param name="optionalNullableList"> optional nullable collection. </param>
+        /// <param name="name"></param>
+        /// <param name="requiredUnion"></param>
+        /// <param name="requiredLiteralString"></param>
+        /// <param name="requiredLiteralInt"></param>
+        /// <param name="requiredLiteralFloat"></param>
+        /// <param name="requiredLiteralBool"></param>
+        /// <param name="requiredBadDescription"></param>
+        /// <param name="requiredNullableList"></param>
+        /// <param name="optionalLiteralString"></param>
+        /// <param name="optionalLiteralInt"></param>
+        /// <param name="optionalLiteralFloat"></param>
+        /// <param name="optionalLiteralBool"></param>
+        /// <param name="optionalNullableList"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/>, <paramref name="requiredUnion"/> or <paramref name="requiredBadDescription"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual ClientResult<Thing> AnonymousBody(string name, BinaryData requiredUnion, AnonymousBodyRequestRequiredLiteralString requiredLiteralString, AnonymousBodyRequestRequiredLiteralInt requiredLiteralInt, AnonymousBodyRequestRequiredLiteralFloat requiredLiteralFloat, bool requiredLiteralBool, string requiredBadDescription, IEnumerable<int> requiredNullableList, AnonymousBodyRequestOptionalLiteralString? optionalLiteralString = default, AnonymousBodyRequestOptionalLiteralInt? optionalLiteralInt = default, AnonymousBodyRequestOptionalLiteralFloat? optionalLiteralFloat = default, bool? optionalLiteralBool = default, IEnumerable<int> optionalNullableList = default)
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual System.ClientModel.ClientResult<Thing> AnonymousBody(string name, System.BinaryData requiredUnion, ThingRequiredLiteralString requiredLiteralString, ThingRequiredLiteralInt requiredLiteralInt, ThingRequiredLiteralFloat requiredLiteralFloat, bool requiredLiteralBool, string requiredBadDescription, IEnumerable<int> requiredNullableList, ThingOptionalLiteralString? optionalLiteralString = default, ThingOptionalLiteralInt? optionalLiteralInt = default, ThingOptionalLiteralFloat? optionalLiteralFloat = default, bool? optionalLiteralBool = default, IEnumerable<int> optionalNullableList = default)
         {
             Argument.AssertNotNull(name, nameof(name));
             Argument.AssertNotNull(requiredUnion, nameof(requiredUnion));
             Argument.AssertNotNull(requiredBadDescription, nameof(requiredBadDescription));
 
-            AnonymousBodyRequest spreadModel = new AnonymousBodyRequest(
+            Thing spreadModel = new Thing(
                 name,
                 requiredUnion,
                 requiredLiteralString,
@@ -641,33 +641,33 @@ public virtual ClientResult<Thing> AnonymousBody(string name, BinaryData require
                 optionalNullableList?.ToList() as IList<int> ?? new ChangeTrackingList<int>(),
                 requiredNullableList?.ToList() as IList<int> ?? new ChangeTrackingList<int>(),
                 null);
-            ClientResult result = AnonymousBody(spreadModel, null);
-            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            System.ClientModel.ClientResult result = this.AnonymousBody(spreadModel, null);
+            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary> body parameter without body decorator. </summary>
-        /// <param name="name"> name of the Thing. </param>
-        /// <param name="requiredUnion"> required Union. </param>
-        /// <param name="requiredLiteralString"> required literal string. </param>
-        /// <param name="requiredLiteralInt"> required literal int. </param>
-        /// <param name="requiredLiteralFloat"> required literal float. </param>
-        /// <param name="requiredLiteralBool"> required literal bool. </param>
-        /// <param name="requiredBadDescription"> description with xml &lt;|endoftext|&gt;. </param>
-        /// <param name="requiredNullableList"> required nullable collection. </param>
-        /// <param name="optionalLiteralString"> optional literal string. </param>
-        /// <param name="optionalLiteralInt"> optional literal int. </param>
-        /// <param name="optionalLiteralFloat"> optional literal float. </param>
-        /// <param name="optionalLiteralBool"> optional literal bool. </param>
-        /// <param name="optionalNullableList"> optional nullable collection. </param>
+        /// <param name="name"></param>
+        /// <param name="requiredUnion"></param>
+        /// <param name="requiredLiteralString"></param>
+        /// <param name="requiredLiteralInt"></param>
+        /// <param name="requiredLiteralFloat"></param>
+        /// <param name="requiredLiteralBool"></param>
+        /// <param name="requiredBadDescription"></param>
+        /// <param name="requiredNullableList"></param>
+        /// <param name="optionalLiteralString"></param>
+        /// <param name="optionalLiteralInt"></param>
+        /// <param name="optionalLiteralFloat"></param>
+        /// <param name="optionalLiteralBool"></param>
+        /// <param name="optionalNullableList"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/>, <paramref name="requiredUnion"/> or <paramref name="requiredBadDescription"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<ClientResult<Thing>> AnonymousBodyAsync(string name, BinaryData requiredUnion, AnonymousBodyRequestRequiredLiteralString requiredLiteralString, AnonymousBodyRequestRequiredLiteralInt requiredLiteralInt, AnonymousBodyRequestRequiredLiteralFloat requiredLiteralFloat, bool requiredLiteralBool, string requiredBadDescription, IEnumerable<int> requiredNullableList, AnonymousBodyRequestOptionalLiteralString? optionalLiteralString = default, AnonymousBodyRequestOptionalLiteralInt? optionalLiteralInt = default, AnonymousBodyRequestOptionalLiteralFloat? optionalLiteralFloat = default, bool? optionalLiteralBool = default, IEnumerable<int> optionalNullableList = default)
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<System.ClientModel.ClientResult<Thing>> AnonymousBodyAsync(string name, System.BinaryData requiredUnion, ThingRequiredLiteralString requiredLiteralString, ThingRequiredLiteralInt requiredLiteralInt, ThingRequiredLiteralFloat requiredLiteralFloat, bool requiredLiteralBool, string requiredBadDescription, IEnumerable<int> requiredNullableList, ThingOptionalLiteralString? optionalLiteralString = default, ThingOptionalLiteralInt? optionalLiteralInt = default, ThingOptionalLiteralFloat? optionalLiteralFloat = default, bool? optionalLiteralBool = default, IEnumerable<int> optionalNullableList = default)
         {
             Argument.AssertNotNull(name, nameof(name));
             Argument.AssertNotNull(requiredUnion, nameof(requiredUnion));
             Argument.AssertNotNull(requiredBadDescription, nameof(requiredBadDescription));
 
-            AnonymousBodyRequest spreadModel = new AnonymousBodyRequest(
+            Thing spreadModel = new Thing(
                 name,
                 requiredUnion,
                 requiredLiteralString,
@@ -682,8 +682,8 @@ public virtual async Task<ClientResult<Thing>> AnonymousBodyAsync(string name, B
                 optionalNullableList?.ToList() as IList<int> ?? new ChangeTrackingList<int>(),
                 requiredNullableList?.ToList() as IList<int> ?? new ChangeTrackingList<int>(),
                 null);
-            ClientResult result = await AnonymousBodyAsync(spreadModel, null).ConfigureAwait(false);
-            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            System.ClientModel.ClientResult result = await this.AnonymousBodyAsync(spreadModel, null).ConfigureAwait(false);
+            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary>
@@ -697,14 +697,14 @@ public virtual async Task<ClientResult<Thing>> AnonymousBodyAsync(string name, B
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual ClientResult FriendlyModel(BinaryContent content, RequestOptions options)
+        public virtual System.ClientModel.ClientResult FriendlyModel(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using PipelineMessage message = CreateFriendlyModelRequest(content, options);
-            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateFriendlyModelRequest(content, options);
+            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -718,40 +718,40 @@ public virtual ClientResult FriendlyModel(BinaryContent content, RequestOptions
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<ClientResult> FriendlyModelAsync(BinaryContent content, RequestOptions options)
+        public virtual async Task<System.ClientModel.ClientResult> FriendlyModelAsync(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using PipelineMessage message = CreateFriendlyModelRequest(content, options);
-            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateFriendlyModelRequest(content, options);
+            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> Model can have its friendly name. </summary>
-        /// <param name="name"> name of the NotFriend. </param>
+        /// <param name="name"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual ClientResult<Friend> FriendlyModel(string name)
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual System.ClientModel.ClientResult<Friend> FriendlyModel(string name)
         {
             Argument.AssertNotNull(name, nameof(name));
 
-            FriendlyModelRequest spreadModel = new FriendlyModelRequest(name, null);
-            ClientResult result = FriendlyModel(spreadModel, null);
-            return ClientResult.FromValue((Friend)result, result.GetRawResponse());
+            Friend spreadModel = new Friend(name, null);
+            System.ClientModel.ClientResult result = this.FriendlyModel(spreadModel, null);
+            return System.ClientModel.ClientResult.FromValue((Friend)result, result.GetRawResponse());
         }
 
         /// <summary> Model can have its friendly name. </summary>
-        /// <param name="name"> name of the NotFriend. </param>
+        /// <param name="name"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<ClientResult<Friend>> FriendlyModelAsync(string name)
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<System.ClientModel.ClientResult<Friend>> FriendlyModelAsync(string name)
         {
             Argument.AssertNotNull(name, nameof(name));
 
-            FriendlyModelRequest spreadModel = new FriendlyModelRequest(name, null);
-            ClientResult result = await FriendlyModelAsync(spreadModel, null).ConfigureAwait(false);
-            return ClientResult.FromValue((Friend)result, result.GetRawResponse());
+            Friend spreadModel = new Friend(name, null);
+            System.ClientModel.ClientResult result = await this.FriendlyModelAsync(spreadModel, null).ConfigureAwait(false);
+            return System.ClientModel.ClientResult.FromValue((Friend)result, result.GetRawResponse());
         }
 
         /// <summary>
@@ -763,12 +763,12 @@ public virtual async Task<ClientResult<Friend>> FriendlyModelAsync(string name)
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual ClientResult AddTimeHeader(RequestOptions options)
+        public virtual System.ClientModel.ClientResult AddTimeHeader(System.ClientModel.Primitives.RequestOptions options)
         {
-            using PipelineMessage message = CreateAddTimeHeaderRequest(options);
-            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateAddTimeHeaderRequest(options);
+            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -780,24 +780,24 @@ public virtual ClientResult AddTimeHeader(RequestOptions options)
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<ClientResult> AddTimeHeaderAsync(RequestOptions options)
+        public virtual async Task<System.ClientModel.ClientResult> AddTimeHeaderAsync(System.ClientModel.Primitives.RequestOptions options)
         {
-            using PipelineMessage message = CreateAddTimeHeaderRequest(options);
-            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateAddTimeHeaderRequest(options);
+            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> addTimeHeader. </summary>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual ClientResult AddTimeHeader()
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual System.ClientModel.ClientResult AddTimeHeader()
         {
             return AddTimeHeader(null);
         }
 
         /// <summary> addTimeHeader. </summary>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<ClientResult> AddTimeHeaderAsync()
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<System.ClientModel.ClientResult> AddTimeHeaderAsync()
         {
             return await AddTimeHeaderAsync(null).ConfigureAwait(false);
         }
@@ -813,14 +813,14 @@ public virtual async Task<ClientResult> AddTimeHeaderAsync()
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual ClientResult ProjectedNameModel(BinaryContent content, RequestOptions options)
+        public virtual System.ClientModel.ClientResult ProjectedNameModel(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using PipelineMessage message = CreateProjectedNameModelRequest(content, options);
-            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateProjectedNameModelRequest(content, options);
+            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -834,40 +834,40 @@ public virtual ClientResult ProjectedNameModel(BinaryContent content, RequestOpt
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<ClientResult> ProjectedNameModelAsync(BinaryContent content, RequestOptions options)
+        public virtual async Task<System.ClientModel.ClientResult> ProjectedNameModelAsync(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using PipelineMessage message = CreateProjectedNameModelRequest(content, options);
-            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateProjectedNameModelRequest(content, options);
+            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> Model can have its projected name. </summary>
-        /// <param name="name"> name of the ModelWithProjectedName. </param>
+        /// <param name="name"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual ClientResult<ProjectedModel> ProjectedNameModel(string name)
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual System.ClientModel.ClientResult<ProjectedModel> ProjectedNameModel(string name)
         {
             Argument.AssertNotNull(name, nameof(name));
 
-            ProjectedNameModelRequest spreadModel = new ProjectedNameModelRequest(name, null);
-            ClientResult result = ProjectedNameModel(spreadModel, null);
-            return ClientResult.FromValue((ProjectedModel)result, result.GetRawResponse());
+            ProjectedModel spreadModel = new ProjectedModel(name, null);
+            System.ClientModel.ClientResult result = this.ProjectedNameModel(spreadModel, null);
+            return System.ClientModel.ClientResult.FromValue((ProjectedModel)result, result.GetRawResponse());
         }
 
         /// <summary> Model can have its projected name. </summary>
-        /// <param name="name"> name of the ModelWithProjectedName. </param>
+        /// <param name="name"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<ClientResult<ProjectedModel>> ProjectedNameModelAsync(string name)
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<System.ClientModel.ClientResult<ProjectedModel>> ProjectedNameModelAsync(string name)
         {
             Argument.AssertNotNull(name, nameof(name));
 
-            ProjectedNameModelRequest spreadModel = new ProjectedNameModelRequest(name, null);
-            ClientResult result = await ProjectedNameModelAsync(spreadModel, null).ConfigureAwait(false);
-            return ClientResult.FromValue((ProjectedModel)result, result.GetRawResponse());
+            ProjectedModel spreadModel = new ProjectedModel(name, null);
+            System.ClientModel.ClientResult result = await this.ProjectedNameModelAsync(spreadModel, null).ConfigureAwait(false);
+            return System.ClientModel.ClientResult.FromValue((ProjectedModel)result, result.GetRawResponse());
         }
 
         /// <summary>
@@ -879,12 +879,12 @@ public virtual async Task<ClientResult<ProjectedModel>> ProjectedNameModelAsync(
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual ClientResult ReturnsAnonymousModel(RequestOptions options)
+        public virtual System.ClientModel.ClientResult ReturnsAnonymousModel(System.ClientModel.Primitives.RequestOptions options)
         {
-            using PipelineMessage message = CreateReturnsAnonymousModelRequest(options);
-            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateReturnsAnonymousModelRequest(options);
+            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -896,28 +896,28 @@ public virtual ClientResult ReturnsAnonymousModel(RequestOptions options)
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<ClientResult> ReturnsAnonymousModelAsync(RequestOptions options)
+        public virtual async Task<System.ClientModel.ClientResult> ReturnsAnonymousModelAsync(System.ClientModel.Primitives.RequestOptions options)
         {
-            using PipelineMessage message = CreateReturnsAnonymousModelRequest(options);
-            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateReturnsAnonymousModelRequest(options);
+            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> return anonymous model. </summary>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual ClientResult<ReturnsAnonymousModelResponse> ReturnsAnonymousModel()
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual System.ClientModel.ClientResult<ReturnsAnonymousModelResponse> ReturnsAnonymousModel()
         {
-            ClientResult result = ReturnsAnonymousModel(null);
-            return ClientResult.FromValue((ReturnsAnonymousModelResponse)result, result.GetRawResponse());
+            System.ClientModel.ClientResult result = ReturnsAnonymousModel(null);
+            return System.ClientModel.ClientResult.FromValue((ReturnsAnonymousModelResponse)result, result.GetRawResponse());
         }
 
         /// <summary> return anonymous model. </summary>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<ClientResult<ReturnsAnonymousModelResponse>> ReturnsAnonymousModelAsync()
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<System.ClientModel.ClientResult<ReturnsAnonymousModelResponse>> ReturnsAnonymousModelAsync()
         {
-            ClientResult result = await ReturnsAnonymousModelAsync(null).ConfigureAwait(false);
-            return ClientResult.FromValue((ReturnsAnonymousModelResponse)result, result.GetRawResponse());
+            System.ClientModel.ClientResult result = await ReturnsAnonymousModelAsync(null).ConfigureAwait(false);
+            return System.ClientModel.ClientResult.FromValue((ReturnsAnonymousModelResponse)result, result.GetRawResponse());
         }
 
         /// <summary>
@@ -931,14 +931,14 @@ public virtual async Task<ClientResult<ReturnsAnonymousModelResponse>> ReturnsAn
         /// <param name="accept"></param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="accept"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual ClientResult GetUnknownValue(string accept, RequestOptions options)
+        public virtual System.ClientModel.ClientResult GetUnknownValue(string accept, System.ClientModel.Primitives.RequestOptions options)
         {
             Argument.AssertNotNull(accept, nameof(accept));
 
-            using PipelineMessage message = CreateGetUnknownValueRequest(accept, options);
-            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateGetUnknownValueRequest(accept, options);
+            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -952,38 +952,38 @@ public virtual ClientResult GetUnknownValue(string accept, RequestOptions option
         /// <param name="accept"></param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="accept"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<ClientResult> GetUnknownValueAsync(string accept, RequestOptions options)
+        public virtual async Task<System.ClientModel.ClientResult> GetUnknownValueAsync(string accept, System.ClientModel.Primitives.RequestOptions options)
         {
             Argument.AssertNotNull(accept, nameof(accept));
 
-            using PipelineMessage message = CreateGetUnknownValueRequest(accept, options);
-            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateGetUnknownValueRequest(accept, options);
+            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> get extensible enum. </summary>
         /// <param name="accept"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="accept"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual ClientResult<string> GetUnknownValue(string accept)
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual System.ClientModel.ClientResult<string> GetUnknownValue(string accept)
         {
             Argument.AssertNotNull(accept, nameof(accept));
 
-            ClientResult result = GetUnknownValue(accept, null);
-            return ClientResult.FromValue(result.GetRawResponse().Content.ToObjectFromJson<string>(), result.GetRawResponse());
+            System.ClientModel.ClientResult result = GetUnknownValue(accept, null);
+            return System.ClientModel.ClientResult.FromValue(result.GetRawResponse().Content.ToObjectFromJson<string>(), result.GetRawResponse());
         }
 
         /// <summary> get extensible enum. </summary>
         /// <param name="accept"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="accept"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<ClientResult<string>> GetUnknownValueAsync(string accept)
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<System.ClientModel.ClientResult<string>> GetUnknownValueAsync(string accept)
         {
             Argument.AssertNotNull(accept, nameof(accept));
 
-            ClientResult result = await GetUnknownValueAsync(accept, null).ConfigureAwait(false);
-            return ClientResult.FromValue(result.GetRawResponse().Content.ToObjectFromJson<string>(), result.GetRawResponse());
+            System.ClientModel.ClientResult result = await GetUnknownValueAsync(accept, null).ConfigureAwait(false);
+            return System.ClientModel.ClientResult.FromValue(result.GetRawResponse().Content.ToObjectFromJson<string>(), result.GetRawResponse());
         }
 
         /// <summary>
@@ -997,14 +997,14 @@ public virtual async Task<ClientResult<string>> GetUnknownValueAsync(string acce
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual ClientResult InternalProtocol(BinaryContent content, RequestOptions options)
+        public virtual System.ClientModel.ClientResult InternalProtocol(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using PipelineMessage message = CreateInternalProtocolRequest(content, options);
-            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateInternalProtocolRequest(content, options);
+            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -1018,38 +1018,38 @@ public virtual ClientResult InternalProtocol(BinaryContent content, RequestOptio
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<ClientResult> InternalProtocolAsync(BinaryContent content, RequestOptions options)
+        public virtual async Task<System.ClientModel.ClientResult> InternalProtocolAsync(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using PipelineMessage message = CreateInternalProtocolRequest(content, options);
-            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateInternalProtocolRequest(content, options);
+            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> When set protocol false and convenient true, then the protocol method should be internal. </summary>
         /// <param name="body"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual ClientResult<Thing> InternalProtocol(Thing body)
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual System.ClientModel.ClientResult<Thing> InternalProtocol(Thing body)
         {
             Argument.AssertNotNull(body, nameof(body));
 
-            ClientResult result = InternalProtocol(body, null);
-            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            System.ClientModel.ClientResult result = this.InternalProtocol(body, null);
+            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary> When set protocol false and convenient true, then the protocol method should be internal. </summary>
         /// <param name="body"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<ClientResult<Thing>> InternalProtocolAsync(Thing body)
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<System.ClientModel.ClientResult<Thing>> InternalProtocolAsync(Thing body)
         {
             Argument.AssertNotNull(body, nameof(body));
 
-            ClientResult result = await InternalProtocolAsync(body, null).ConfigureAwait(false);
-            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            System.ClientModel.ClientResult result = await this.InternalProtocolAsync(body, null).ConfigureAwait(false);
+            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary>
@@ -1061,12 +1061,12 @@ public virtual async Task<ClientResult<Thing>> InternalProtocolAsync(Thing body)
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual ClientResult StillConvenient(RequestOptions options)
+        public virtual System.ClientModel.ClientResult StillConvenient(System.ClientModel.Primitives.RequestOptions options)
         {
-            using PipelineMessage message = CreateStillConvenientRequest(options);
-            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateStillConvenientRequest(options);
+            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -1078,24 +1078,24 @@ public virtual ClientResult StillConvenient(RequestOptions options)
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<ClientResult> StillConvenientAsync(RequestOptions options)
+        public virtual async Task<System.ClientModel.ClientResult> StillConvenientAsync(System.ClientModel.Primitives.RequestOptions options)
         {
-            using PipelineMessage message = CreateStillConvenientRequest(options);
-            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateStillConvenientRequest(options);
+            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> When set protocol false and convenient true, the convenient method should be generated even it has the same signature as protocol one. </summary>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual ClientResult StillConvenient()
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual System.ClientModel.ClientResult StillConvenient()
         {
             return StillConvenient(null);
         }
 
         /// <summary> When set protocol false and convenient true, the convenient method should be generated even it has the same signature as protocol one. </summary>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<ClientResult> StillConvenientAsync()
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<System.ClientModel.ClientResult> StillConvenientAsync()
         {
             return await StillConvenientAsync(null).ConfigureAwait(false);
         }
@@ -1111,14 +1111,14 @@ public virtual async Task<ClientResult> StillConvenientAsync()
         /// <param name="id"></param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="id"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual ClientResult HeadAsBoolean(string id, RequestOptions options)
+        public virtual System.ClientModel.ClientResult HeadAsBoolean(string id, System.ClientModel.Primitives.RequestOptions options)
         {
             Argument.AssertNotNull(id, nameof(id));
 
-            using PipelineMessage message = CreateHeadAsBooleanRequest(id, options);
-            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateHeadAsBooleanRequest(id, options);
+            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -1132,21 +1132,21 @@ public virtual ClientResult HeadAsBoolean(string id, RequestOptions options)
         /// <param name="id"></param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="id"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<ClientResult> HeadAsBooleanAsync(string id, RequestOptions options)
+        public virtual async Task<System.ClientModel.ClientResult> HeadAsBooleanAsync(string id, System.ClientModel.Primitives.RequestOptions options)
         {
             Argument.AssertNotNull(id, nameof(id));
 
-            using PipelineMessage message = CreateHeadAsBooleanRequest(id, options);
-            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using System.ClientModel.Primitives.PipelineMessage message = CreateHeadAsBooleanRequest(id, options);
+            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> head as boolean. </summary>
         /// <param name="id"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="id"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual ClientResult HeadAsBoolean(string id)
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual System.ClientModel.ClientResult HeadAsBoolean(string id)
         {
             Argument.AssertNotNull(id, nameof(id));
 
@@ -1156,8 +1156,8 @@ public virtual ClientResult HeadAsBoolean(string id)
         /// <summary> head as boolean. </summary>
         /// <param name="id"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="id"/> is null. </exception>
-        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<ClientResult> HeadAsBooleanAsync(string id)
+        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<System.ClientModel.ClientResult> HeadAsBooleanAsync(string id)
         {
             Argument.AssertNotNull(id, nameof(id));
 
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClientOptions.cs
index 902ba6acf9826..e6c0941576d93 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClientOptions.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClientOptions.cs
@@ -11,7 +11,7 @@
 namespace BasicTypeSpec
 {
     /// <summary> Client options for <see cref="BasicTypeSpecClient"/>. </summary>
-    public partial class BasicTypeSpecClientOptions : ClientPipelineOptions
+    public partial class BasicTypeSpecClientOptions : System.ClientModel.Primitives.ClientPipelineOptions
     {
         private const ServiceVersion LatestVersion = ServiceVersion.V2024_08_16_Preview;
 
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecModelFactory.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecModelFactory.cs
index b52d06da39c90..91edba445d8b6 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecModelFactory.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecModelFactory.cs
@@ -15,22 +15,22 @@ namespace BasicTypeSpec.Models
     /// <summary> A factory class for creating instances of the models for mocking. </summary>
     public static partial class BasicTypeSpecModelFactory
     {
-        /// <summary> A model with a few properties of literal types. </summary>
-        /// <param name="name"> name of the Thing. </param>
-        /// <param name="requiredUnion"> required Union. </param>
-        /// <param name="requiredLiteralString"> required literal string. </param>
-        /// <param name="requiredLiteralInt"> required literal int. </param>
-        /// <param name="requiredLiteralFloat"> required literal float. </param>
-        /// <param name="requiredLiteralBool"> required literal bool. </param>
-        /// <param name="optionalLiteralString"> optional literal string. </param>
-        /// <param name="optionalLiteralInt"> optional literal int. </param>
-        /// <param name="optionalLiteralFloat"> optional literal float. </param>
-        /// <param name="optionalLiteralBool"> optional literal bool. </param>
-        /// <param name="requiredBadDescription"> description with xml &lt;|endoftext|&gt;. </param>
-        /// <param name="optionalNullableList"> optional nullable collection. </param>
-        /// <param name="requiredNullableList"> required nullable collection. </param>
+        /// <summary> The Thing. </summary>
+        /// <param name="name"></param>
+        /// <param name="requiredUnion"></param>
+        /// <param name="requiredLiteralString"></param>
+        /// <param name="requiredLiteralInt"></param>
+        /// <param name="requiredLiteralFloat"></param>
+        /// <param name="requiredLiteralBool"></param>
+        /// <param name="optionalLiteralString"></param>
+        /// <param name="optionalLiteralInt"></param>
+        /// <param name="optionalLiteralFloat"></param>
+        /// <param name="optionalLiteralBool"></param>
+        /// <param name="requiredBadDescription"></param>
+        /// <param name="optionalNullableList"></param>
+        /// <param name="requiredNullableList"></param>
         /// <returns> A new <see cref="Models.Thing"/> instance for mocking. </returns>
-        public static Thing Thing(string name = default, BinaryData requiredUnion = default, ThingRequiredLiteralString requiredLiteralString = default, ThingRequiredLiteralInt requiredLiteralInt = default, ThingRequiredLiteralFloat requiredLiteralFloat = default, bool requiredLiteralBool = default, ThingOptionalLiteralString? optionalLiteralString = default, ThingOptionalLiteralInt? optionalLiteralInt = default, ThingOptionalLiteralFloat? optionalLiteralFloat = default, bool? optionalLiteralBool = default, string requiredBadDescription = default, IEnumerable<int> optionalNullableList = default, IEnumerable<int> requiredNullableList = default)
+        public static Thing Thing(string name = default, System.BinaryData requiredUnion = default, ThingRequiredLiteralString requiredLiteralString = default, ThingRequiredLiteralInt requiredLiteralInt = default, ThingRequiredLiteralFloat requiredLiteralFloat = default, bool requiredLiteralBool = default, ThingOptionalLiteralString? optionalLiteralString = default, ThingOptionalLiteralInt? optionalLiteralInt = default, ThingOptionalLiteralFloat? optionalLiteralFloat = default, bool? optionalLiteralBool = default, string requiredBadDescription = default, IEnumerable<int> optionalNullableList = default, IEnumerable<int> requiredNullableList = default)
         {
             optionalNullableList ??= new ChangeTrackingList<int>();
             requiredNullableList ??= new ChangeTrackingList<int>();
@@ -52,33 +52,33 @@ public static Thing Thing(string name = default, BinaryData requiredUnion = defa
                 null);
         }
 
-        /// <summary> this is a roundtrip model. </summary>
-        /// <param name="requiredString"> Required string, illustrating a reference type property. </param>
-        /// <param name="requiredInt"> Required int, illustrating a value type property. </param>
-        /// <param name="requiredCollection"> Required collection of enums. </param>
-        /// <param name="requiredDictionary"> Required dictionary of enums. </param>
-        /// <param name="requiredModel"> Required model. </param>
-        /// <param name="intExtensibleEnum"> this is an int based extensible enum. </param>
-        /// <param name="intExtensibleEnumCollection"> this is a collection of int based extensible enum. </param>
-        /// <param name="floatExtensibleEnum"> this is a float based extensible enum. </param>
-        /// <param name="floatExtensibleEnumWithIntValue"> this is a float based extensible enum. </param>
-        /// <param name="floatExtensibleEnumCollection"> this is a collection of float based extensible enum. </param>
-        /// <param name="floatFixedEnum"> this is a float based fixed enum. </param>
-        /// <param name="floatFixedEnumWithIntValue"> this is a float based fixed enum. </param>
-        /// <param name="floatFixedEnumCollection"> this is a collection of float based fixed enum. </param>
-        /// <param name="intFixedEnum"> this is a int based fixed enum. </param>
-        /// <param name="intFixedEnumCollection"> this is a collection of int based fixed enum. </param>
-        /// <param name="stringFixedEnum"> this is a string based fixed enum. </param>
-        /// <param name="requiredUnknown"> required unknown. </param>
-        /// <param name="optionalUnknown"> optional unknown. </param>
-        /// <param name="requiredRecordUnknown"> required record of unknown. </param>
-        /// <param name="optionalRecordUnknown"> optional record of unknown. </param>
-        /// <param name="readOnlyRequiredRecordUnknown"> required readonly record of unknown. </param>
-        /// <param name="readOnlyOptionalRecordUnknown"> optional readonly record of unknown. </param>
-        /// <param name="modelWithRequiredNullable"> this is a model with required nullable properties. </param>
-        /// <param name="requiredBytes"> Required bytes. </param>
+        /// <summary> The RoundTripModel. </summary>
+        /// <param name="requiredString"></param>
+        /// <param name="requiredInt"></param>
+        /// <param name="requiredCollection"></param>
+        /// <param name="requiredDictionary"></param>
+        /// <param name="requiredModel"></param>
+        /// <param name="intExtensibleEnum"></param>
+        /// <param name="intExtensibleEnumCollection"></param>
+        /// <param name="floatExtensibleEnum"></param>
+        /// <param name="floatExtensibleEnumWithIntValue"></param>
+        /// <param name="floatExtensibleEnumCollection"></param>
+        /// <param name="floatFixedEnum"></param>
+        /// <param name="floatFixedEnumWithIntValue"></param>
+        /// <param name="floatFixedEnumCollection"></param>
+        /// <param name="intFixedEnum"></param>
+        /// <param name="intFixedEnumCollection"></param>
+        /// <param name="stringFixedEnum"></param>
+        /// <param name="requiredUnknown"></param>
+        /// <param name="optionalUnknown"></param>
+        /// <param name="requiredRecordUnknown"></param>
+        /// <param name="optionalRecordUnknown"></param>
+        /// <param name="readOnlyRequiredRecordUnknown"></param>
+        /// <param name="readOnlyOptionalRecordUnknown"></param>
+        /// <param name="modelWithRequiredNullable"></param>
+        /// <param name="requiredBytes"></param>
         /// <returns> A new <see cref="Models.RoundTripModel"/> instance for mocking. </returns>
-        public static RoundTripModel RoundTripModel(string requiredString = default, int requiredInt = default, IEnumerable<StringFixedEnum> requiredCollection = default, IDictionary<string, StringExtensibleEnum> requiredDictionary = default, Thing requiredModel = default, IntExtensibleEnum? intExtensibleEnum = default, IEnumerable<IntExtensibleEnum> intExtensibleEnumCollection = default, FloatExtensibleEnum? floatExtensibleEnum = default, FloatExtensibleEnumWithIntValue? floatExtensibleEnumWithIntValue = default, IEnumerable<FloatExtensibleEnum> floatExtensibleEnumCollection = default, FloatFixedEnum? floatFixedEnum = default, FloatFixedEnumWithIntValue? floatFixedEnumWithIntValue = default, IEnumerable<FloatFixedEnum> floatFixedEnumCollection = default, IntFixedEnum? intFixedEnum = default, IEnumerable<IntFixedEnum> intFixedEnumCollection = default, StringFixedEnum? stringFixedEnum = default, BinaryData requiredUnknown = default, BinaryData optionalUnknown = default, IDictionary<string, BinaryData> requiredRecordUnknown = default, IDictionary<string, BinaryData> optionalRecordUnknown = default, IReadOnlyDictionary<string, BinaryData> readOnlyRequiredRecordUnknown = default, IReadOnlyDictionary<string, BinaryData> readOnlyOptionalRecordUnknown = default, ModelWithRequiredNullableProperties modelWithRequiredNullable = default, BinaryData requiredBytes = default)
+        public static RoundTripModel RoundTripModel(string requiredString = default, int requiredInt = default, IEnumerable<StringFixedEnum> requiredCollection = default, IDictionary<string, StringExtensibleEnum> requiredDictionary = default, Thing requiredModel = default, IntExtensibleEnum? intExtensibleEnum = default, IEnumerable<IntExtensibleEnum> intExtensibleEnumCollection = default, FloatExtensibleEnum? floatExtensibleEnum = default, FloatExtensibleEnumWithIntValue? floatExtensibleEnumWithIntValue = default, IEnumerable<FloatExtensibleEnum> floatExtensibleEnumCollection = default, FloatFixedEnum? floatFixedEnum = default, FloatFixedEnumWithIntValue? floatFixedEnumWithIntValue = default, IEnumerable<FloatFixedEnum> floatFixedEnumCollection = default, IntFixedEnum? intFixedEnum = default, IEnumerable<IntFixedEnum> intFixedEnumCollection = default, StringFixedEnum? stringFixedEnum = default, System.BinaryData requiredUnknown = default, System.BinaryData optionalUnknown = default, IDictionary<string, System.BinaryData> requiredRecordUnknown = default, IDictionary<string, System.BinaryData> optionalRecordUnknown = default, IReadOnlyDictionary<string, System.BinaryData> readOnlyRequiredRecordUnknown = default, IReadOnlyDictionary<string, System.BinaryData> readOnlyOptionalRecordUnknown = default, ModelWithRequiredNullableProperties modelWithRequiredNullable = default, System.BinaryData requiredBytes = default)
         {
             requiredCollection ??= new ChangeTrackingList<StringFixedEnum>();
             requiredDictionary ??= new ChangeTrackingDictionary<string, StringExtensibleEnum>();
@@ -86,10 +86,10 @@ public static RoundTripModel RoundTripModel(string requiredString = default, int
             floatExtensibleEnumCollection ??= new ChangeTrackingList<FloatExtensibleEnum>();
             floatFixedEnumCollection ??= new ChangeTrackingList<FloatFixedEnum>();
             intFixedEnumCollection ??= new ChangeTrackingList<IntFixedEnum>();
-            requiredRecordUnknown ??= new ChangeTrackingDictionary<string, BinaryData>();
-            optionalRecordUnknown ??= new ChangeTrackingDictionary<string, BinaryData>();
-            readOnlyRequiredRecordUnknown ??= new ChangeTrackingDictionary<string, BinaryData>();
-            readOnlyOptionalRecordUnknown ??= new ChangeTrackingDictionary<string, BinaryData>();
+            requiredRecordUnknown ??= new ChangeTrackingDictionary<string, System.BinaryData>();
+            optionalRecordUnknown ??= new ChangeTrackingDictionary<string, System.BinaryData>();
+            readOnlyRequiredRecordUnknown ??= new ChangeTrackingDictionary<string, System.BinaryData>();
+            readOnlyOptionalRecordUnknown ??= new ChangeTrackingDictionary<string, System.BinaryData>();
 
             return new RoundTripModel(
                 requiredString,
@@ -119,10 +119,10 @@ public static RoundTripModel RoundTripModel(string requiredString = default, int
                 null);
         }
 
-        /// <summary> A model with a few required nullable properties. </summary>
-        /// <param name="requiredNullablePrimitive"> required nullable primitive type. </param>
-        /// <param name="requiredExtensibleEnum"> required nullable extensible enum type. </param>
-        /// <param name="requiredFixedEnum"> required nullable fixed enum type. </param>
+        /// <summary> The ModelWithRequiredNullableProperties. </summary>
+        /// <param name="requiredNullablePrimitive"></param>
+        /// <param name="requiredExtensibleEnum"></param>
+        /// <param name="requiredFixedEnum"></param>
         /// <returns> A new <see cref="Models.ModelWithRequiredNullableProperties"/> instance for mocking. </returns>
         public static ModelWithRequiredNullableProperties ModelWithRequiredNullableProperties(int? requiredNullablePrimitive = default, StringExtensibleEnum? requiredExtensibleEnum = default, StringFixedEnum? requiredFixedEnum = default)
         {
@@ -130,8 +130,8 @@ public static ModelWithRequiredNullableProperties ModelWithRequiredNullablePrope
             return new ModelWithRequiredNullableProperties(requiredNullablePrimitive, requiredExtensibleEnum, requiredFixedEnum, null);
         }
 
-        /// <summary> this is not a friendly model but with a friendly name. </summary>
-        /// <param name="name"> name of the NotFriend. </param>
+        /// <summary> The Friend. </summary>
+        /// <param name="name"></param>
         /// <returns> A new <see cref="Models.Friend"/> instance for mocking. </returns>
         public static Friend Friend(string name = default)
         {
@@ -139,8 +139,8 @@ public static Friend Friend(string name = default)
             return new Friend(name, null);
         }
 
-        /// <summary> this is a model with a projected name. </summary>
-        /// <param name="name"> name of the ModelWithProjectedName. </param>
+        /// <summary> The ProjectedModel. </summary>
+        /// <param name="name"></param>
         /// <returns> A new <see cref="Models.ProjectedModel"/> instance for mocking. </returns>
         public static ProjectedModel ProjectedModel(string name = default)
         {
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ClientPipelineExtensions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ClientPipelineExtensions.cs
index d9378b66796ea..ec1f11974e061 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ClientPipelineExtensions.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ClientPipelineExtensions.cs
@@ -13,57 +13,57 @@ namespace BasicTypeSpec
 {
     internal static partial class ClientPipelineExtensions
     {
-        public static async ValueTask<PipelineResponse> ProcessMessageAsync(this ClientPipeline pipeline, PipelineMessage message, RequestOptions options)
+        public static async ValueTask<System.ClientModel.Primitives.PipelineResponse> ProcessMessageAsync(this System.ClientModel.Primitives.ClientPipeline pipeline, System.ClientModel.Primitives.PipelineMessage message, System.ClientModel.Primitives.RequestOptions options)
         {
             await pipeline.SendAsync(message).ConfigureAwait(false);
 
-            if (message.Response.IsError && (options?.ErrorOptions & ClientErrorBehaviors.NoThrow) != ClientErrorBehaviors.NoThrow)
+            if (message.Response.IsError && (options?.ErrorOptions & System.ClientModel.Primitives.ClientErrorBehaviors.NoThrow) != System.ClientModel.Primitives.ClientErrorBehaviors.NoThrow)
             {
-                throw await ClientResultException.CreateAsync(message.Response).ConfigureAwait(false);
+                throw await System.ClientModel.ClientResultException.CreateAsync(message.Response).ConfigureAwait(false);
             }
 
-            PipelineResponse response = message.BufferResponse ? message.Response : message.ExtractResponse();
+            System.ClientModel.Primitives.PipelineResponse response = message.BufferResponse ? message.Response : message.ExtractResponse();
             return response;
         }
 
-        public static PipelineResponse ProcessMessage(this ClientPipeline pipeline, PipelineMessage message, RequestOptions options)
+        public static System.ClientModel.Primitives.PipelineResponse ProcessMessage(this System.ClientModel.Primitives.ClientPipeline pipeline, System.ClientModel.Primitives.PipelineMessage message, System.ClientModel.Primitives.RequestOptions options)
         {
             pipeline.Send(message);
 
-            if (message.Response.IsError && (options?.ErrorOptions & ClientErrorBehaviors.NoThrow) != ClientErrorBehaviors.NoThrow)
+            if (message.Response.IsError && (options?.ErrorOptions & System.ClientModel.Primitives.ClientErrorBehaviors.NoThrow) != System.ClientModel.Primitives.ClientErrorBehaviors.NoThrow)
             {
-                throw new ClientResultException(message.Response);
+                throw new System.ClientModel.ClientResultException(message.Response);
             }
 
-            PipelineResponse response = message.BufferResponse ? message.Response : message.ExtractResponse();
+            System.ClientModel.Primitives.PipelineResponse response = message.BufferResponse ? message.Response : message.ExtractResponse();
             return response;
         }
 
-        public static async ValueTask<ClientResult<bool>> ProcessHeadAsBoolMessageAsync(this ClientPipeline pipeline, PipelineMessage message, RequestOptions options)
+        public static async ValueTask<System.ClientModel.ClientResult<bool>> ProcessHeadAsBoolMessageAsync(this System.ClientModel.Primitives.ClientPipeline pipeline, System.ClientModel.Primitives.PipelineMessage message, System.ClientModel.Primitives.RequestOptions options)
         {
-            PipelineResponse response = await pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false);
+            System.ClientModel.Primitives.PipelineResponse response = await pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false);
             switch (response.Status)
             {
                 case >= 200 and < 300:
-                    return ClientResult.FromValue(true, response);
+                    return System.ClientModel.ClientResult.FromValue<bool>(true, response);
                 case >= 400 and < 500:
-                    return ClientResult.FromValue(false, response);
+                    return System.ClientModel.ClientResult.FromValue<bool>(false, response);
                 default:
-                    return new ErrorResult<bool>(response, new ClientResultException(response));
+                    return new ErrorResult<bool>(response, new System.ClientModel.ClientResultException(response));
             }
         }
 
-        public static ClientResult<bool> ProcessHeadAsBoolMessage(this ClientPipeline pipeline, PipelineMessage message, RequestOptions options)
+        public static System.ClientModel.ClientResult<bool> ProcessHeadAsBoolMessage(this System.ClientModel.Primitives.ClientPipeline pipeline, System.ClientModel.Primitives.PipelineMessage message, System.ClientModel.Primitives.RequestOptions options)
         {
-            PipelineResponse response = pipeline.ProcessMessage(message, options);
+            System.ClientModel.Primitives.PipelineResponse response = pipeline.ProcessMessage(message, options);
             switch (response.Status)
             {
                 case >= 200 and < 300:
-                    return ClientResult.FromValue(true, response);
+                    return System.ClientModel.ClientResult.FromValue<bool>(true, response);
                 case >= 400 and < 500:
-                    return ClientResult.FromValue(false, response);
+                    return System.ClientModel.ClientResult.FromValue<bool>(false, response);
                 default:
-                    return new ErrorResult<bool>(response, new ClientResultException(response));
+                    return new ErrorResult<bool>(response, new System.ClientModel.ClientResultException(response));
             }
         }
     }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ClientUriBuilder.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ClientUriBuilder.cs
index a887f440ebe9b..79aba0986caa1 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ClientUriBuilder.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ClientUriBuilder.cs
@@ -14,7 +14,7 @@ namespace BasicTypeSpec
 {
     internal partial class ClientUriBuilder
     {
-        private UriBuilder _uriBuilder;
+        private System.UriBuilder _uriBuilder;
         private StringBuilder _pathBuilder;
         private StringBuilder _queryBuilder;
 
@@ -22,15 +22,15 @@ public ClientUriBuilder()
         {
         }
 
-        private UriBuilder UriBuilder => _uriBuilder  ??=  new UriBuilder();
+        private System.UriBuilder UriBuilder => _uriBuilder  ??=  new System.UriBuilder();
 
         private StringBuilder PathBuilder => _pathBuilder  ??=  new StringBuilder(UriBuilder.Path);
 
         private StringBuilder QueryBuilder => _queryBuilder  ??=  new StringBuilder(UriBuilder.Query);
 
-        public void Reset(Uri uri)
+        public void Reset(System.Uri uri)
         {
-            _uriBuilder = new UriBuilder(uri);
+            _uriBuilder = new System.UriBuilder(uri);
             _pathBuilder = new StringBuilder(UriBuilder.Path);
             _queryBuilder = new StringBuilder(UriBuilder.Query);
         }
@@ -39,7 +39,7 @@ public void AppendPath(string value, bool escape)
         {
             if (escape)
             {
-                value = Uri.EscapeDataString(value);
+                value = System.Uri.EscapeDataString(value);
             }
             if (PathBuilder.Length > 0 && PathBuilder[PathBuilder.Length - 1] == '/' && value[0] == '/')
             {
@@ -77,7 +77,7 @@ public void AppendQuery(string name, string value, bool escape)
             }
             if (escape)
             {
-                value = Uri.EscapeDataString(value);
+                value = System.Uri.EscapeDataString(value);
             }
             QueryBuilder.Append(name);
             QueryBuilder.Append('=');
@@ -118,7 +118,7 @@ public void AppendQueryDelimited<T>(string name, IEnumerable<T> value, string de
             AppendQuery(name, string.Join(delimiter, stringValues), escape);
         }
 
-        public Uri ToUri()
+        public System.Uri ToUri()
         {
             if (_pathBuilder != null)
             {
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ErrorResult.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ErrorResult.cs
index 99d36a31e528f..b000b471cc214 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ErrorResult.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ErrorResult.cs
@@ -10,12 +10,12 @@
 
 namespace BasicTypeSpec
 {
-    internal partial class ErrorResult<T> : ClientResult<T>
+    internal partial class ErrorResult<T> : System.ClientModel.ClientResult<T>
     {
-        private readonly PipelineResponse _response;
-        private readonly ClientResultException _exception;
+        private readonly System.ClientModel.Primitives.PipelineResponse _response;
+        private readonly System.ClientModel.ClientResultException _exception;
 
-        public ErrorResult(PipelineResponse response, ClientResultException exception) : base(default, response)
+        public ErrorResult(System.ClientModel.Primitives.PipelineResponse response, System.ClientModel.ClientResultException exception) : base(default, response)
         {
             _response = response;
             _exception = exception;
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ModelSerializationExtensions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ModelSerializationExtensions.cs
index 1cb0c768c47c5..f22c27582e7fd 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ModelSerializationExtensions.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ModelSerializationExtensions.cs
@@ -16,15 +16,15 @@ namespace BasicTypeSpec
 {
     internal static partial class ModelSerializationExtensions
     {
-        internal static readonly ModelReaderWriterOptions WireOptions = new ModelReaderWriterOptions("W");
+        internal static readonly System.ClientModel.Primitives.ModelReaderWriterOptions WireOptions = new System.ClientModel.Primitives.ModelReaderWriterOptions("W");
 
-        public static object GetObject(this JsonElement element)
+        public static object GetObject(this System.Text.Json.JsonElement element)
         {
             switch (element.ValueKind)
             {
-                case JsonValueKind.String:
+                case System.Text.Json.JsonValueKind.String:
                     return element.GetString();
-                case JsonValueKind.Number:
+                case System.Text.Json.JsonValueKind.Number:
                     if (element.TryGetInt32(out int intValue))
                     {
                         return intValue;
@@ -34,21 +34,21 @@ public static object GetObject(this JsonElement element)
                         return longValue;
                     }
                     return element.GetDouble();
-                case JsonValueKind.True:
+                case System.Text.Json.JsonValueKind.True:
                     return true;
-                case JsonValueKind.False:
+                case System.Text.Json.JsonValueKind.False:
                     return false;
-                case JsonValueKind.Undefined:
-                case JsonValueKind.Null:
+                case System.Text.Json.JsonValueKind.Undefined:
+                case System.Text.Json.JsonValueKind.Null:
                     return null;
-                case JsonValueKind.Object:
+                case System.Text.Json.JsonValueKind.Object:
                     Dictionary<string, object> dictionary = new Dictionary<string, object>();
                     foreach (var jsonProperty in element.EnumerateObject())
                     {
                         dictionary.Add(jsonProperty.Name, jsonProperty.Value.GetObject());
                     }
                     return dictionary;
-                case JsonValueKind.Array:
+                case System.Text.Json.JsonValueKind.Array:
                     List<object> list = new List<object>();
                     foreach (var item in element.EnumerateArray())
                     {
@@ -60,9 +60,9 @@ public static object GetObject(this JsonElement element)
             }
         }
 
-        public static byte[] GetBytesFromBase64(this JsonElement element, string format)
+        public static byte[] GetBytesFromBase64(this System.Text.Json.JsonElement element, string format)
         {
-            if (element.ValueKind == JsonValueKind.Null)
+            if (element.ValueKind == System.Text.Json.JsonValueKind.Null)
             {
                 return null;
             }
@@ -75,17 +75,17 @@ public static byte[] GetBytesFromBase64(this JsonElement element, string format)
             };
         }
 
-        public static DateTimeOffset GetDateTimeOffset(this JsonElement element, string format) => format switch
+        public static DateTimeOffset GetDateTimeOffset(this System.Text.Json.JsonElement element, string format) => format switch
         {
-            "U" when element.ValueKind == JsonValueKind.Number => DateTimeOffset.FromUnixTimeSeconds(element.GetInt64()),
+            "U" when element.ValueKind == System.Text.Json.JsonValueKind.Number => DateTimeOffset.FromUnixTimeSeconds(element.GetInt64()),
             _ => TypeFormatters.ParseDateTimeOffset(element.GetString(), format)
         };
 
-        public static TimeSpan GetTimeSpan(this JsonElement element, string format) => TypeFormatters.ParseTimeSpan(element.GetString(), format);
+        public static TimeSpan GetTimeSpan(this System.Text.Json.JsonElement element, string format) => TypeFormatters.ParseTimeSpan(element.GetString(), format);
 
-        public static char GetChar(this JsonElement element)
+        public static char GetChar(this System.Text.Json.JsonElement element)
         {
-            if (element.ValueKind == JsonValueKind.String)
+            if (element.ValueKind == System.Text.Json.JsonValueKind.String)
             {
                 string text = element.GetString();
                 if (text == null || text.Length != 1)
@@ -101,12 +101,12 @@ public static char GetChar(this JsonElement element)
         }
 
         [Conditional("DEBUG")]
-        public static void ThrowNonNullablePropertyIsNull(this JsonProperty @property)
+        public static void ThrowNonNullablePropertyIsNull(this System.Text.Json.JsonProperty @property)
         {
-            throw new JsonException($"A property '{@property.Name}' defined as non-nullable but received as null from the service. This exception only happens in DEBUG builds of the library and would be ignored in the release build");
+            throw new System.Text.Json.JsonException($"A property '{@property.Name}' defined as non-nullable but received as null from the service. This exception only happens in DEBUG builds of the library and would be ignored in the release build");
         }
 
-        public static string GetRequiredString(this JsonElement element)
+        public static string GetRequiredString(this System.Text.Json.JsonElement element)
         {
             string value = element.GetString();
             if (value == null)
@@ -116,27 +116,27 @@ public static string GetRequiredString(this JsonElement element)
             return value;
         }
 
-        public static void WriteStringValue(this Utf8JsonWriter writer, DateTimeOffset value, string format)
+        public static void WriteStringValue(this System.Text.Json.Utf8JsonWriter writer, DateTimeOffset value, string format)
         {
             writer.WriteStringValue(TypeFormatters.ToString(value, format));
         }
 
-        public static void WriteStringValue(this Utf8JsonWriter writer, DateTime value, string format)
+        public static void WriteStringValue(this System.Text.Json.Utf8JsonWriter writer, DateTime value, string format)
         {
             writer.WriteStringValue(TypeFormatters.ToString(value, format));
         }
 
-        public static void WriteStringValue(this Utf8JsonWriter writer, TimeSpan value, string format)
+        public static void WriteStringValue(this System.Text.Json.Utf8JsonWriter writer, TimeSpan value, string format)
         {
             writer.WriteStringValue(TypeFormatters.ToString(value, format));
         }
 
-        public static void WriteStringValue(this Utf8JsonWriter writer, char value)
+        public static void WriteStringValue(this System.Text.Json.Utf8JsonWriter writer, char value)
         {
             writer.WriteStringValue(value.ToString(CultureInfo.InvariantCulture));
         }
 
-        public static void WriteBase64StringValue(this Utf8JsonWriter writer, byte[] value, string format)
+        public static void WriteBase64StringValue(this System.Text.Json.Utf8JsonWriter writer, byte[] value, string format)
         {
             if (value == null)
             {
@@ -156,7 +156,7 @@ public static void WriteBase64StringValue(this Utf8JsonWriter writer, byte[] val
             }
         }
 
-        public static void WriteNumberValue(this Utf8JsonWriter writer, DateTimeOffset value, string format)
+        public static void WriteNumberValue(this System.Text.Json.Utf8JsonWriter writer, DateTimeOffset value, string format)
         {
             if (format != "U")
             {
@@ -165,23 +165,23 @@ public static void WriteNumberValue(this Utf8JsonWriter writer, DateTimeOffset v
             writer.WriteNumberValue(value.ToUnixTimeSeconds());
         }
 
-        public static void WriteObjectValue<T>(this Utf8JsonWriter writer, T value, ModelReaderWriterOptions options = null)
+        public static void WriteObjectValue<T>(this System.Text.Json.Utf8JsonWriter writer, T value, System.ClientModel.Primitives.ModelReaderWriterOptions options = (System.ClientModel.Primitives.ModelReaderWriterOptions)null)
         {
             switch (value)
             {
                 case null:
                     writer.WriteNullValue();
                     break;
-                case IJsonModel<T> jsonModel:
+                case System.ClientModel.Primitives.IJsonModel<T> jsonModel:
                     jsonModel.Write(writer, options ?? WireOptions);
                     break;
                 case byte[] bytes:
                     writer.WriteBase64StringValue(bytes);
                     break;
-                case BinaryData bytes0:
+                case System.BinaryData bytes0:
                     writer.WriteBase64StringValue(bytes0);
                     break;
-                case JsonElement json:
+                case System.Text.Json.JsonElement json:
                     json.WriteTo(writer);
                     break;
                 case int i:
@@ -246,7 +246,7 @@ public static void WriteObjectValue<T>(this Utf8JsonWriter writer, T value, Mode
             }
         }
 
-        public static void WriteObjectValue(this Utf8JsonWriter writer, object value, ModelReaderWriterOptions options = null)
+        public static void WriteObjectValue(this System.Text.Json.Utf8JsonWriter writer, object value, System.ClientModel.Primitives.ModelReaderWriterOptions options = (System.ClientModel.Primitives.ModelReaderWriterOptions)null)
         {
             writer.WriteObjectValue<object>(value, options);
         }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/Optional.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/Optional.cs
index 34ce441ed6120..d7a4c7cc3e8b4 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/Optional.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/Optional.cs
@@ -43,9 +43,9 @@ public static bool IsDefined(string value)
             return value != null;
         }
 
-        public static bool IsDefined(JsonElement value)
+        public static bool IsDefined(System.Text.Json.JsonElement value)
         {
-            return value.ValueKind != JsonValueKind.Undefined;
+            return value.ValueKind != System.Text.Json.JsonValueKind.Undefined;
         }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/TypeFormatters.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/TypeFormatters.cs
index 6cb37b3a0ad12..13fc48b8b0eed 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/TypeFormatters.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/TypeFormatters.cs
@@ -146,7 +146,7 @@ public static byte[] FromBase64UrlString(string value)
             TimeSpan timeSpan when format != null => ToString(timeSpan, format),
             TimeSpan timeSpan0 => System.Xml.XmlConvert.ToString(timeSpan0),
             Guid guid => guid.ToString(),
-            BinaryData binaryData => ConvertToString(binaryData.ToArray(), format),
+            System.BinaryData binaryData => TypeFormatters.ConvertToString(binaryData.ToArray(), format),
             _ => value.ToString()
         };
     }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequest.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequest.Serialization.cs
deleted file mode 100644
index aed8f79f6ab46..0000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequest.Serialization.cs
+++ /dev/null
@@ -1,342 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using BasicTypeSpec;
-
-namespace BasicTypeSpec.Models
-{
-    /// <summary></summary>
-    internal partial class AnonymousBodyRequest : IJsonModel<AnonymousBodyRequest>
-    {
-        internal AnonymousBodyRequest()
-        {
-        }
-
-        void IJsonModel<AnonymousBodyRequest>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            string format = options.Format == "W" ? ((IPersistableModel<AnonymousBodyRequest>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AnonymousBodyRequest)} does not support writing '{format}' format.");
-            }
-            writer.WritePropertyName("name"u8);
-            writer.WriteStringValue(Name);
-            writer.WritePropertyName("requiredUnion"u8);
-#if NET6_0_OR_GREATER
-            writer.WriteRawValue(RequiredUnion);
-#else
-            using (JsonDocument document = JsonDocument.Parse(RequiredUnion))
-            {
-                JsonSerializer.Serialize(writer, document.RootElement);
-            }
-#endif
-            writer.WritePropertyName("requiredLiteralString"u8);
-            writer.WriteStringValue(RequiredLiteralString.ToString());
-            writer.WritePropertyName("requiredLiteralInt"u8);
-            writer.WriteNumberValue(RequiredLiteralInt.ToSerialInt32());
-            writer.WritePropertyName("requiredLiteralFloat"u8);
-            writer.WriteNumberValue(RequiredLiteralFloat.ToSerialSingle());
-            writer.WritePropertyName("requiredLiteralBool"u8);
-            writer.WriteBooleanValue(RequiredLiteralBool);
-            if (Optional.IsDefined(OptionalLiteralString))
-            {
-                writer.WritePropertyName("optionalLiteralString"u8);
-                writer.WriteStringValue(OptionalLiteralString.Value.ToString());
-            }
-            if (Optional.IsDefined(OptionalLiteralInt))
-            {
-                writer.WritePropertyName("optionalLiteralInt"u8);
-                writer.WriteNumberValue(OptionalLiteralInt.Value.ToSerialInt32());
-            }
-            if (Optional.IsDefined(OptionalLiteralFloat))
-            {
-                writer.WritePropertyName("optionalLiteralFloat"u8);
-                writer.WriteNumberValue(OptionalLiteralFloat.Value.ToSerialSingle());
-            }
-            if (Optional.IsDefined(OptionalLiteralBool))
-            {
-                writer.WritePropertyName("optionalLiteralBool"u8);
-                writer.WriteBooleanValue(OptionalLiteralBool.Value);
-            }
-            writer.WritePropertyName("requiredBadDescription"u8);
-            writer.WriteStringValue(RequiredBadDescription);
-            if (Optional.IsCollectionDefined(OptionalNullableList))
-            {
-                if (OptionalNullableList != null)
-                {
-                    writer.WritePropertyName("optionalNullableList"u8);
-                    writer.WriteStartArray();
-                    foreach (var item in OptionalNullableList)
-                    {
-                        writer.WriteNumberValue(item);
-                    }
-                    writer.WriteEndArray();
-                }
-                else
-                {
-                    writer.WriteNull("optionalNullableList"u8);
-                }
-            }
-            if (RequiredNullableList != null && Optional.IsCollectionDefined(RequiredNullableList))
-            {
-                writer.WritePropertyName("requiredNullableList"u8);
-                writer.WriteStartArray();
-                foreach (var item in RequiredNullableList)
-                {
-                    writer.WriteNumberValue(item);
-                }
-                writer.WriteEndArray();
-            }
-            else
-            {
-                writer.WriteNull("requiredNullableList"u8);
-            }
-            if (options.Format != "W" && _additionalBinaryDataProperties != null)
-            {
-                foreach (var item in _additionalBinaryDataProperties)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-                    writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        AnonymousBodyRequest IJsonModel<AnonymousBodyRequest>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
-
-        /// <param name="reader"> The JSON reader. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual AnonymousBodyRequest JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            string format = options.Format == "W" ? ((IPersistableModel<AnonymousBodyRequest>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(AnonymousBodyRequest)} does not support reading '{format}' format.");
-            }
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeAnonymousBodyRequest(document.RootElement, options);
-        }
-
-        internal static AnonymousBodyRequest DeserializeAnonymousBodyRequest(JsonElement element, ModelReaderWriterOptions options)
-        {
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string name = default;
-            BinaryData requiredUnion = default;
-            AnonymousBodyRequestRequiredLiteralString requiredLiteralString = default;
-            AnonymousBodyRequestRequiredLiteralInt requiredLiteralInt = default;
-            AnonymousBodyRequestRequiredLiteralFloat requiredLiteralFloat = default;
-            bool requiredLiteralBool = default;
-            AnonymousBodyRequestOptionalLiteralString? optionalLiteralString = default;
-            AnonymousBodyRequestOptionalLiteralInt? optionalLiteralInt = default;
-            AnonymousBodyRequestOptionalLiteralFloat? optionalLiteralFloat = default;
-            bool? optionalLiteralBool = default;
-            string requiredBadDescription = default;
-            IList<int> optionalNullableList = default;
-            IList<int> requiredNullableList = default;
-            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
-            foreach (var prop in element.EnumerateObject())
-            {
-                if (prop.NameEquals("name"u8))
-                {
-                    name = prop.Value.GetString();
-                    continue;
-                }
-                if (prop.NameEquals("requiredUnion"u8))
-                {
-                    requiredUnion = BinaryData.FromString(prop.Value.GetRawText());
-                    continue;
-                }
-                if (prop.NameEquals("requiredLiteralString"u8))
-                {
-                    requiredLiteralString = new AnonymousBodyRequestRequiredLiteralString(prop.Value.GetString());
-                    continue;
-                }
-                if (prop.NameEquals("requiredLiteralInt"u8))
-                {
-                    requiredLiteralInt = new AnonymousBodyRequestRequiredLiteralInt(prop.Value.GetInt32());
-                    continue;
-                }
-                if (prop.NameEquals("requiredLiteralFloat"u8))
-                {
-                    requiredLiteralFloat = new AnonymousBodyRequestRequiredLiteralFloat(prop.Value.GetSingle());
-                    continue;
-                }
-                if (prop.NameEquals("requiredLiteralBool"u8))
-                {
-                    requiredLiteralBool = prop.Value.GetBoolean();
-                    continue;
-                }
-                if (prop.NameEquals("optionalLiteralString"u8))
-                {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        optionalLiteralString = null;
-                        continue;
-                    }
-                    optionalLiteralString = new AnonymousBodyRequestOptionalLiteralString(prop.Value.GetString());
-                    continue;
-                }
-                if (prop.NameEquals("optionalLiteralInt"u8))
-                {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        optionalLiteralInt = null;
-                        continue;
-                    }
-                    optionalLiteralInt = new AnonymousBodyRequestOptionalLiteralInt(prop.Value.GetInt32());
-                    continue;
-                }
-                if (prop.NameEquals("optionalLiteralFloat"u8))
-                {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        optionalLiteralFloat = null;
-                        continue;
-                    }
-                    optionalLiteralFloat = new AnonymousBodyRequestOptionalLiteralFloat(prop.Value.GetSingle());
-                    continue;
-                }
-                if (prop.NameEquals("optionalLiteralBool"u8))
-                {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        optionalLiteralBool = null;
-                        continue;
-                    }
-                    optionalLiteralBool = prop.Value.GetBoolean();
-                    continue;
-                }
-                if (prop.NameEquals("requiredBadDescription"u8))
-                {
-                    requiredBadDescription = prop.Value.GetString();
-                    continue;
-                }
-                if (prop.NameEquals("optionalNullableList"u8))
-                {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        continue;
-                    }
-                    List<int> array = new List<int>();
-                    foreach (var item in prop.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetInt32());
-                    }
-                    optionalNullableList = array;
-                    continue;
-                }
-                if (prop.NameEquals("requiredNullableList"u8))
-                {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
-                    {
-                        requiredNullableList = new ChangeTrackingList<int>();
-                        continue;
-                    }
-                    List<int> array = new List<int>();
-                    foreach (var item in prop.Value.EnumerateArray())
-                    {
-                        array.Add(item.GetInt32());
-                    }
-                    requiredNullableList = array;
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
-                }
-            }
-            return new AnonymousBodyRequest(
-                name,
-                requiredUnion,
-                requiredLiteralString,
-                requiredLiteralInt,
-                requiredLiteralFloat,
-                requiredLiteralBool,
-                optionalLiteralString,
-                optionalLiteralInt,
-                optionalLiteralFloat,
-                optionalLiteralBool,
-                requiredBadDescription,
-                optionalNullableList ?? new ChangeTrackingList<int>(),
-                requiredNullableList,
-                additionalBinaryDataProperties);
-        }
-
-        BinaryData IPersistableModel<AnonymousBodyRequest>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
-
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
-        {
-            string format = options.Format == "W" ? ((IPersistableModel<AnonymousBodyRequest>)this).GetFormatFromOptions(options) : options.Format;
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(AnonymousBodyRequest)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        AnonymousBodyRequest IPersistableModel<AnonymousBodyRequest>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
-
-        /// <param name="data"> The data to parse. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual AnonymousBodyRequest PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
-        {
-            string format = options.Format == "W" ? ((IPersistableModel<AnonymousBodyRequest>)this).GetFormatFromOptions(options) : options.Format;
-            switch (format)
-            {
-                case "J":
-                    using (JsonDocument document = JsonDocument.Parse(data))
-                    {
-                        return DeserializeAnonymousBodyRequest(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(AnonymousBodyRequest)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<AnonymousBodyRequest>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <param name="anonymousBodyRequest"> The <see cref="AnonymousBodyRequest"/> to serialize into <see cref="BinaryContent"/>. </param>
-        public static implicit operator BinaryContent(AnonymousBodyRequest anonymousBodyRequest)
-        {
-            return BinaryContent.Create(anonymousBodyRequest, ModelSerializationExtensions.WireOptions);
-        }
-
-        /// <param name="result"> The <see cref="ClientResult"/> to deserialize the <see cref="AnonymousBodyRequest"/> from. </param>
-        public static explicit operator AnonymousBodyRequest(ClientResult result)
-        {
-            using PipelineResponse response = result.GetRawResponse();
-            using JsonDocument document = JsonDocument.Parse(response.Content);
-            return DeserializeAnonymousBodyRequest(document.RootElement, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequest.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequest.cs
deleted file mode 100644
index fb15e8388940c..0000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequest.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-using BasicTypeSpec;
-
-namespace BasicTypeSpec.Models
-{
-    /// <summary> The AnonymousBodyRequest. </summary>
-    internal partial class AnonymousBodyRequest
-    {
-        /// <summary> Keeps track of any properties unknown to the library. </summary>
-        private protected IDictionary<string, BinaryData> _additionalBinaryDataProperties;
-
-        internal AnonymousBodyRequest(string name, BinaryData requiredUnion, string requiredBadDescription, IEnumerable<int> requiredNullableList)
-        {
-            Name = name;
-            RequiredUnion = requiredUnion;
-            RequiredBadDescription = requiredBadDescription;
-            OptionalNullableList = new ChangeTrackingList<int>();
-            RequiredNullableList = requiredNullableList?.ToList();
-        }
-
-        internal AnonymousBodyRequest(string name, BinaryData requiredUnion, AnonymousBodyRequestRequiredLiteralString requiredLiteralString, AnonymousBodyRequestRequiredLiteralInt requiredLiteralInt, AnonymousBodyRequestRequiredLiteralFloat requiredLiteralFloat, bool requiredLiteralBool, AnonymousBodyRequestOptionalLiteralString? optionalLiteralString, AnonymousBodyRequestOptionalLiteralInt? optionalLiteralInt, AnonymousBodyRequestOptionalLiteralFloat? optionalLiteralFloat, bool? optionalLiteralBool, string requiredBadDescription, IList<int> optionalNullableList, IList<int> requiredNullableList, IDictionary<string, BinaryData> additionalBinaryDataProperties)
-        {
-            Name = name;
-            RequiredUnion = requiredUnion;
-            RequiredLiteralString = requiredLiteralString;
-            RequiredLiteralInt = requiredLiteralInt;
-            RequiredLiteralFloat = requiredLiteralFloat;
-            RequiredLiteralBool = requiredLiteralBool;
-            OptionalLiteralString = optionalLiteralString;
-            OptionalLiteralInt = optionalLiteralInt;
-            OptionalLiteralFloat = optionalLiteralFloat;
-            OptionalLiteralBool = optionalLiteralBool;
-            RequiredBadDescription = requiredBadDescription;
-            OptionalNullableList = optionalNullableList;
-            RequiredNullableList = requiredNullableList;
-            _additionalBinaryDataProperties = additionalBinaryDataProperties;
-        }
-
-        /// <summary> name of the Thing. </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// required Union
-        /// <para> To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, JsonSerializerOptions?)"/>. </para>
-        /// <para> To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>. </para>
-        /// <para>
-        /// <remarks>
-        /// Supported types:
-        /// <list type="bullet">
-        /// <item>
-        /// <description> <see cref="string"/>. </description>
-        /// </item>
-        /// <item>
-        /// <description> <see cref="IList{T}"/> where <c>T</c> is of type <see cref="string"/>. </description>
-        /// </item>
-        /// <item>
-        /// <description> <see cref="int"/>. </description>
-        /// </item>
-        /// </list>
-        /// </remarks>
-        /// </para>
-        /// <para>
-        /// Examples:
-        /// <list type="bullet">
-        /// <item>
-        /// <term> BinaryData.FromObjectAsJson("foo"). </term>
-        /// <description> Creates a payload of "foo". </description>
-        /// </item>
-        /// <item>
-        /// <term> BinaryData.FromString("\"foo\""). </term>
-        /// <description> Creates a payload of "foo". </description>
-        /// </item>
-        /// <item>
-        /// <term> BinaryData.FromObjectAsJson(new { key = "value" }). </term>
-        /// <description> Creates a payload of { "key": "value" }. </description>
-        /// </item>
-        /// <item>
-        /// <term> BinaryData.FromString("{\"key\": \"value\"}"). </term>
-        /// <description> Creates a payload of { "key": "value" }. </description>
-        /// </item>
-        /// </list>
-        /// </para>
-        /// </summary>
-        public BinaryData RequiredUnion { get; set; }
-
-        /// <summary> required literal string. </summary>
-        public AnonymousBodyRequestRequiredLiteralString RequiredLiteralString { get; } = "accept";
-
-        /// <summary> required literal int. </summary>
-        public AnonymousBodyRequestRequiredLiteralInt RequiredLiteralInt { get; } = 123;
-
-        /// <summary> required literal float. </summary>
-        public AnonymousBodyRequestRequiredLiteralFloat RequiredLiteralFloat { get; } = 1.23F;
-
-        /// <summary> required literal bool. </summary>
-        public bool RequiredLiteralBool { get; } = false;
-
-        /// <summary> optional literal string. </summary>
-        public AnonymousBodyRequestOptionalLiteralString? OptionalLiteralString { get; set; }
-
-        /// <summary> optional literal int. </summary>
-        public AnonymousBodyRequestOptionalLiteralInt? OptionalLiteralInt { get; set; }
-
-        /// <summary> optional literal float. </summary>
-        public AnonymousBodyRequestOptionalLiteralFloat? OptionalLiteralFloat { get; set; }
-
-        /// <summary> optional literal bool. </summary>
-        public bool? OptionalLiteralBool { get; set; }
-
-        /// <summary> description with xml &lt;|endoftext|&gt;. </summary>
-        public string RequiredBadDescription { get; set; }
-
-        /// <summary> optional nullable collection. </summary>
-        public IList<int> OptionalNullableList { get; set; }
-
-        /// <summary> required nullable collection. </summary>
-        public IList<int> RequiredNullableList { get; set; }
-    }
-}
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestOptionalLiteralFloat.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestOptionalLiteralFloat.Serialization.cs
deleted file mode 100644
index 8ce7df2648af4..0000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestOptionalLiteralFloat.Serialization.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-namespace BasicTypeSpec.Models
-{
-    /// <summary></summary>
-    public readonly partial struct AnonymousBodyRequestOptionalLiteralFloat
-    {
-        internal float ToSerialSingle() => _value;
-    }
-}
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestOptionalLiteralFloat.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestOptionalLiteralFloat.cs
deleted file mode 100644
index e93cd939069ba..0000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestOptionalLiteralFloat.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-using System.Globalization;
-
-namespace BasicTypeSpec.Models
-{
-    /// <summary> The AnonymousBodyRequest_optionalLiteralFloat. </summary>
-    public readonly partial struct AnonymousBodyRequestOptionalLiteralFloat : IEquatable<AnonymousBodyRequestOptionalLiteralFloat>
-    {
-        private readonly float _value;
-        /// <summary> 4.56. </summary>
-        private const float _456Value = 4.56F;
-
-        /// <summary> Initializes a new instance of <see cref="AnonymousBodyRequestOptionalLiteralFloat"/>. </summary>
-        /// <param name="value"> The value. </param>
-        public AnonymousBodyRequestOptionalLiteralFloat(float value)
-        {
-            _value = value;
-        }
-
-        /// <summary> 4.56. </summary>
-        public static AnonymousBodyRequestOptionalLiteralFloat _456 { get; } = new AnonymousBodyRequestOptionalLiteralFloat(_456Value);
-
-        /// <summary> Determines if two <see cref="AnonymousBodyRequestOptionalLiteralFloat"/> values are the same. </summary>
-        /// <param name="left"> The left value to compare. </param>
-        /// <param name="right"> The right value to compare. </param>
-        public static bool operator ==(AnonymousBodyRequestOptionalLiteralFloat left, AnonymousBodyRequestOptionalLiteralFloat right) => left.Equals(right);
-
-        /// <summary> Determines if two <see cref="AnonymousBodyRequestOptionalLiteralFloat"/> values are not the same. </summary>
-        /// <param name="left"> The left value to compare. </param>
-        /// <param name="right"> The right value to compare. </param>
-        public static bool operator !=(AnonymousBodyRequestOptionalLiteralFloat left, AnonymousBodyRequestOptionalLiteralFloat right) => !left.Equals(right);
-
-        /// <summary> Converts a string to a <see cref="AnonymousBodyRequestOptionalLiteralFloat"/>. </summary>
-        /// <param name="value"> The value. </param>
-        public static implicit operator AnonymousBodyRequestOptionalLiteralFloat(float value) => new AnonymousBodyRequestOptionalLiteralFloat(value);
-
-        /// <param name="obj"> The object to compare. </param>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is AnonymousBodyRequestOptionalLiteralFloat other && Equals(other);
-
-        /// <param name="other"> The instance to compare. </param>
-        public bool Equals(AnonymousBodyRequestOptionalLiteralFloat other) => Equals(_value, other._value);
-
-        /// <inheritdoc/>
-        public override int GetHashCode() => _value.GetHashCode();
-
-        /// <inheritdoc/>
-        public override string ToString() => _value.ToString(CultureInfo.InvariantCulture);
-    }
-}
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestOptionalLiteralInt.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestOptionalLiteralInt.Serialization.cs
deleted file mode 100644
index 26bc9db6442f9..0000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestOptionalLiteralInt.Serialization.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-namespace BasicTypeSpec.Models
-{
-    /// <summary></summary>
-    public readonly partial struct AnonymousBodyRequestOptionalLiteralInt
-    {
-        internal int ToSerialInt32() => _value;
-    }
-}
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestOptionalLiteralInt.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestOptionalLiteralInt.cs
deleted file mode 100644
index 8ba0020b646cb..0000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestOptionalLiteralInt.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-using System.Globalization;
-
-namespace BasicTypeSpec.Models
-{
-    /// <summary> The AnonymousBodyRequest_optionalLiteralInt. </summary>
-    public readonly partial struct AnonymousBodyRequestOptionalLiteralInt : IEquatable<AnonymousBodyRequestOptionalLiteralInt>
-    {
-        private readonly int _value;
-        /// <summary> 456. </summary>
-        private const int _456Value = 456;
-
-        /// <summary> Initializes a new instance of <see cref="AnonymousBodyRequestOptionalLiteralInt"/>. </summary>
-        /// <param name="value"> The value. </param>
-        public AnonymousBodyRequestOptionalLiteralInt(int value)
-        {
-            _value = value;
-        }
-
-        /// <summary> 456. </summary>
-        public static AnonymousBodyRequestOptionalLiteralInt _456 { get; } = new AnonymousBodyRequestOptionalLiteralInt(_456Value);
-
-        /// <summary> Determines if two <see cref="AnonymousBodyRequestOptionalLiteralInt"/> values are the same. </summary>
-        /// <param name="left"> The left value to compare. </param>
-        /// <param name="right"> The right value to compare. </param>
-        public static bool operator ==(AnonymousBodyRequestOptionalLiteralInt left, AnonymousBodyRequestOptionalLiteralInt right) => left.Equals(right);
-
-        /// <summary> Determines if two <see cref="AnonymousBodyRequestOptionalLiteralInt"/> values are not the same. </summary>
-        /// <param name="left"> The left value to compare. </param>
-        /// <param name="right"> The right value to compare. </param>
-        public static bool operator !=(AnonymousBodyRequestOptionalLiteralInt left, AnonymousBodyRequestOptionalLiteralInt right) => !left.Equals(right);
-
-        /// <summary> Converts a string to a <see cref="AnonymousBodyRequestOptionalLiteralInt"/>. </summary>
-        /// <param name="value"> The value. </param>
-        public static implicit operator AnonymousBodyRequestOptionalLiteralInt(int value) => new AnonymousBodyRequestOptionalLiteralInt(value);
-
-        /// <param name="obj"> The object to compare. </param>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is AnonymousBodyRequestOptionalLiteralInt other && Equals(other);
-
-        /// <param name="other"> The instance to compare. </param>
-        public bool Equals(AnonymousBodyRequestOptionalLiteralInt other) => Equals(_value, other._value);
-
-        /// <inheritdoc/>
-        public override int GetHashCode() => _value.GetHashCode();
-
-        /// <inheritdoc/>
-        public override string ToString() => _value.ToString(CultureInfo.InvariantCulture);
-    }
-}
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestOptionalLiteralString.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestOptionalLiteralString.cs
deleted file mode 100644
index d6f233d77790a..0000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestOptionalLiteralString.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-using BasicTypeSpec;
-
-namespace BasicTypeSpec.Models
-{
-    /// <summary> The AnonymousBodyRequest_optionalLiteralString. </summary>
-    public readonly partial struct AnonymousBodyRequestOptionalLiteralString : IEquatable<AnonymousBodyRequestOptionalLiteralString>
-    {
-        private readonly string _value;
-        /// <summary> reject. </summary>
-        private const string RejectValue = "reject";
-
-        /// <summary> Initializes a new instance of <see cref="AnonymousBodyRequestOptionalLiteralString"/>. </summary>
-        /// <param name="value"> The value. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public AnonymousBodyRequestOptionalLiteralString(string value)
-        {
-            Argument.AssertNotNull(value, nameof(value));
-
-            _value = value;
-        }
-
-        /// <summary> reject. </summary>
-        public static AnonymousBodyRequestOptionalLiteralString Reject { get; } = new AnonymousBodyRequestOptionalLiteralString(RejectValue);
-
-        /// <summary> Determines if two <see cref="AnonymousBodyRequestOptionalLiteralString"/> values are the same. </summary>
-        /// <param name="left"> The left value to compare. </param>
-        /// <param name="right"> The right value to compare. </param>
-        public static bool operator ==(AnonymousBodyRequestOptionalLiteralString left, AnonymousBodyRequestOptionalLiteralString right) => left.Equals(right);
-
-        /// <summary> Determines if two <see cref="AnonymousBodyRequestOptionalLiteralString"/> values are not the same. </summary>
-        /// <param name="left"> The left value to compare. </param>
-        /// <param name="right"> The right value to compare. </param>
-        public static bool operator !=(AnonymousBodyRequestOptionalLiteralString left, AnonymousBodyRequestOptionalLiteralString right) => !left.Equals(right);
-
-        /// <summary> Converts a string to a <see cref="AnonymousBodyRequestOptionalLiteralString"/>. </summary>
-        /// <param name="value"> The value. </param>
-        public static implicit operator AnonymousBodyRequestOptionalLiteralString(string value) => new AnonymousBodyRequestOptionalLiteralString(value);
-
-        /// <param name="obj"> The object to compare. </param>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is AnonymousBodyRequestOptionalLiteralString other && Equals(other);
-
-        /// <param name="other"> The instance to compare. </param>
-        public bool Equals(AnonymousBodyRequestOptionalLiteralString other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc/>
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-
-        /// <inheritdoc/>
-        public override string ToString() => _value;
-    }
-}
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestRequiredLiteralFloat.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestRequiredLiteralFloat.Serialization.cs
deleted file mode 100644
index 6d7720e0b124e..0000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestRequiredLiteralFloat.Serialization.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-namespace BasicTypeSpec.Models
-{
-    /// <summary></summary>
-    public readonly partial struct AnonymousBodyRequestRequiredLiteralFloat
-    {
-        internal float ToSerialSingle() => _value;
-    }
-}
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestRequiredLiteralFloat.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestRequiredLiteralFloat.cs
deleted file mode 100644
index 93afe618dc74e..0000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestRequiredLiteralFloat.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-using System.Globalization;
-
-namespace BasicTypeSpec.Models
-{
-    /// <summary> The AnonymousBodyRequest_requiredLiteralFloat. </summary>
-    public readonly partial struct AnonymousBodyRequestRequiredLiteralFloat : IEquatable<AnonymousBodyRequestRequiredLiteralFloat>
-    {
-        private readonly float _value;
-        /// <summary> 1.23. </summary>
-        private const float _123Value = 1.23F;
-
-        /// <summary> Initializes a new instance of <see cref="AnonymousBodyRequestRequiredLiteralFloat"/>. </summary>
-        /// <param name="value"> The value. </param>
-        public AnonymousBodyRequestRequiredLiteralFloat(float value)
-        {
-            _value = value;
-        }
-
-        /// <summary> 1.23. </summary>
-        public static AnonymousBodyRequestRequiredLiteralFloat _123 { get; } = new AnonymousBodyRequestRequiredLiteralFloat(_123Value);
-
-        /// <summary> Determines if two <see cref="AnonymousBodyRequestRequiredLiteralFloat"/> values are the same. </summary>
-        /// <param name="left"> The left value to compare. </param>
-        /// <param name="right"> The right value to compare. </param>
-        public static bool operator ==(AnonymousBodyRequestRequiredLiteralFloat left, AnonymousBodyRequestRequiredLiteralFloat right) => left.Equals(right);
-
-        /// <summary> Determines if two <see cref="AnonymousBodyRequestRequiredLiteralFloat"/> values are not the same. </summary>
-        /// <param name="left"> The left value to compare. </param>
-        /// <param name="right"> The right value to compare. </param>
-        public static bool operator !=(AnonymousBodyRequestRequiredLiteralFloat left, AnonymousBodyRequestRequiredLiteralFloat right) => !left.Equals(right);
-
-        /// <summary> Converts a string to a <see cref="AnonymousBodyRequestRequiredLiteralFloat"/>. </summary>
-        /// <param name="value"> The value. </param>
-        public static implicit operator AnonymousBodyRequestRequiredLiteralFloat(float value) => new AnonymousBodyRequestRequiredLiteralFloat(value);
-
-        /// <param name="obj"> The object to compare. </param>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is AnonymousBodyRequestRequiredLiteralFloat other && Equals(other);
-
-        /// <param name="other"> The instance to compare. </param>
-        public bool Equals(AnonymousBodyRequestRequiredLiteralFloat other) => Equals(_value, other._value);
-
-        /// <inheritdoc/>
-        public override int GetHashCode() => _value.GetHashCode();
-
-        /// <inheritdoc/>
-        public override string ToString() => _value.ToString(CultureInfo.InvariantCulture);
-    }
-}
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestRequiredLiteralInt.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestRequiredLiteralInt.Serialization.cs
deleted file mode 100644
index d0f68bb34aec3..0000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestRequiredLiteralInt.Serialization.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-namespace BasicTypeSpec.Models
-{
-    /// <summary></summary>
-    public readonly partial struct AnonymousBodyRequestRequiredLiteralInt
-    {
-        internal int ToSerialInt32() => _value;
-    }
-}
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestRequiredLiteralInt.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestRequiredLiteralInt.cs
deleted file mode 100644
index 33b59e555b5f8..0000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestRequiredLiteralInt.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-using System.Globalization;
-
-namespace BasicTypeSpec.Models
-{
-    /// <summary> The AnonymousBodyRequest_requiredLiteralInt. </summary>
-    public readonly partial struct AnonymousBodyRequestRequiredLiteralInt : IEquatable<AnonymousBodyRequestRequiredLiteralInt>
-    {
-        private readonly int _value;
-        /// <summary> 123. </summary>
-        private const int _123Value = 123;
-
-        /// <summary> Initializes a new instance of <see cref="AnonymousBodyRequestRequiredLiteralInt"/>. </summary>
-        /// <param name="value"> The value. </param>
-        public AnonymousBodyRequestRequiredLiteralInt(int value)
-        {
-            _value = value;
-        }
-
-        /// <summary> 123. </summary>
-        public static AnonymousBodyRequestRequiredLiteralInt _123 { get; } = new AnonymousBodyRequestRequiredLiteralInt(_123Value);
-
-        /// <summary> Determines if two <see cref="AnonymousBodyRequestRequiredLiteralInt"/> values are the same. </summary>
-        /// <param name="left"> The left value to compare. </param>
-        /// <param name="right"> The right value to compare. </param>
-        public static bool operator ==(AnonymousBodyRequestRequiredLiteralInt left, AnonymousBodyRequestRequiredLiteralInt right) => left.Equals(right);
-
-        /// <summary> Determines if two <see cref="AnonymousBodyRequestRequiredLiteralInt"/> values are not the same. </summary>
-        /// <param name="left"> The left value to compare. </param>
-        /// <param name="right"> The right value to compare. </param>
-        public static bool operator !=(AnonymousBodyRequestRequiredLiteralInt left, AnonymousBodyRequestRequiredLiteralInt right) => !left.Equals(right);
-
-        /// <summary> Converts a string to a <see cref="AnonymousBodyRequestRequiredLiteralInt"/>. </summary>
-        /// <param name="value"> The value. </param>
-        public static implicit operator AnonymousBodyRequestRequiredLiteralInt(int value) => new AnonymousBodyRequestRequiredLiteralInt(value);
-
-        /// <param name="obj"> The object to compare. </param>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is AnonymousBodyRequestRequiredLiteralInt other && Equals(other);
-
-        /// <param name="other"> The instance to compare. </param>
-        public bool Equals(AnonymousBodyRequestRequiredLiteralInt other) => Equals(_value, other._value);
-
-        /// <inheritdoc/>
-        public override int GetHashCode() => _value.GetHashCode();
-
-        /// <inheritdoc/>
-        public override string ToString() => _value.ToString(CultureInfo.InvariantCulture);
-    }
-}
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestRequiredLiteralString.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestRequiredLiteralString.cs
deleted file mode 100644
index 5a3e704e2d53a..0000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/AnonymousBodyRequestRequiredLiteralString.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ComponentModel;
-using BasicTypeSpec;
-
-namespace BasicTypeSpec.Models
-{
-    /// <summary> The AnonymousBodyRequest_requiredLiteralString. </summary>
-    public readonly partial struct AnonymousBodyRequestRequiredLiteralString : IEquatable<AnonymousBodyRequestRequiredLiteralString>
-    {
-        private readonly string _value;
-        /// <summary> accept. </summary>
-        private const string AcceptValue = "accept";
-
-        /// <summary> Initializes a new instance of <see cref="AnonymousBodyRequestRequiredLiteralString"/>. </summary>
-        /// <param name="value"> The value. </param>
-        /// <exception cref="ArgumentNullException"> <paramref name="value"/> is null. </exception>
-        public AnonymousBodyRequestRequiredLiteralString(string value)
-        {
-            Argument.AssertNotNull(value, nameof(value));
-
-            _value = value;
-        }
-
-        /// <summary> accept. </summary>
-        public static AnonymousBodyRequestRequiredLiteralString Accept { get; } = new AnonymousBodyRequestRequiredLiteralString(AcceptValue);
-
-        /// <summary> Determines if two <see cref="AnonymousBodyRequestRequiredLiteralString"/> values are the same. </summary>
-        /// <param name="left"> The left value to compare. </param>
-        /// <param name="right"> The right value to compare. </param>
-        public static bool operator ==(AnonymousBodyRequestRequiredLiteralString left, AnonymousBodyRequestRequiredLiteralString right) => left.Equals(right);
-
-        /// <summary> Determines if two <see cref="AnonymousBodyRequestRequiredLiteralString"/> values are not the same. </summary>
-        /// <param name="left"> The left value to compare. </param>
-        /// <param name="right"> The right value to compare. </param>
-        public static bool operator !=(AnonymousBodyRequestRequiredLiteralString left, AnonymousBodyRequestRequiredLiteralString right) => !left.Equals(right);
-
-        /// <summary> Converts a string to a <see cref="AnonymousBodyRequestRequiredLiteralString"/>. </summary>
-        /// <param name="value"> The value. </param>
-        public static implicit operator AnonymousBodyRequestRequiredLiteralString(string value) => new AnonymousBodyRequestRequiredLiteralString(value);
-
-        /// <param name="obj"> The object to compare. </param>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public override bool Equals(object obj) => obj is AnonymousBodyRequestRequiredLiteralString other && Equals(other);
-
-        /// <param name="other"> The instance to compare. </param>
-        public bool Equals(AnonymousBodyRequestRequiredLiteralString other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase);
-
-        /// <inheritdoc/>
-        public override int GetHashCode() => _value != null ? StringComparer.InvariantCultureIgnoreCase.GetHashCode(_value) : 0;
-
-        /// <inheritdoc/>
-        public override string ToString() => _value;
-    }
-}
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatExtensibleEnum.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatExtensibleEnum.cs
index 1ea90f23f92bf..6585e3f5319d8 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatExtensibleEnum.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatExtensibleEnum.cs
@@ -11,7 +11,7 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary> Float based extensible enum. </summary>
+    /// <summary></summary>
     public readonly partial struct FloatExtensibleEnum : IEquatable<FloatExtensibleEnum>
     {
         private readonly float _value;
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatExtensibleEnumWithIntValue.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatExtensibleEnumWithIntValue.cs
index 021f057db2cd8..9082934a43f6a 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatExtensibleEnumWithIntValue.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatExtensibleEnumWithIntValue.cs
@@ -11,7 +11,7 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary> float fixed enum. </summary>
+    /// <summary></summary>
     public readonly partial struct FloatExtensibleEnumWithIntValue : IEquatable<FloatExtensibleEnumWithIntValue>
     {
         private readonly float _value;
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatFixedEnum.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatFixedEnum.cs
index 3fb7df3312008..0f084aca262ba 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatFixedEnum.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatFixedEnum.cs
@@ -7,7 +7,7 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary> float fixed enum. </summary>
+    /// <summary></summary>
     public enum FloatFixedEnum
     {
         /// <summary> OneDotOne. </summary>
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatFixedEnumWithIntValue.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatFixedEnumWithIntValue.cs
index b29e7c2c7941c..566c1c83ff8dd 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatFixedEnumWithIntValue.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatFixedEnumWithIntValue.cs
@@ -7,7 +7,7 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary> float fixed enum. </summary>
+    /// <summary></summary>
     public enum FloatFixedEnumWithIntValue
     {
         /// <summary> One. </summary>
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Friend.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Friend.Serialization.cs
index 7d1bd5d9d46a5..89d35f5ee5343 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Friend.Serialization.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Friend.Serialization.cs
@@ -15,13 +15,13 @@
 namespace BasicTypeSpec.Models
 {
     /// <summary></summary>
-    public partial class Friend : IJsonModel<Friend>
+    public partial class Friend : System.ClientModel.Primitives.IJsonModel<Friend>
     {
         internal Friend()
         {
         }
 
-        void IJsonModel<Friend>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void System.ClientModel.Primitives.IJsonModel<Friend>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -30,9 +30,9 @@ void IJsonModel<Friend>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions op
 
         /// <param name="writer"> The JSON writer. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<Friend>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<Friend>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(Friend)} does not support writing '{format}' format.");
@@ -47,38 +47,38 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
 #if NET6_0_OR_GREATER
                     writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(item.Value))
                     {
-                        JsonSerializer.Serialize(writer, document.RootElement);
+                        System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
                     }
 #endif
                 }
             }
         }
 
-        Friend IJsonModel<Friend>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+        Friend System.ClientModel.Primitives.IJsonModel<Friend>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
 
         /// <param name="reader"> The JSON reader. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual Friend JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        protected virtual Friend JsonModelCreateCore(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<Friend>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<Friend>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(Friend)} does not support reading '{format}' format.");
             }
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeFriend(document.RootElement, options);
+            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.ParseValue(ref reader);
+            return Friend.DeserializeFriend(document.RootElement, options);
         }
 
-        internal static Friend DeserializeFriend(JsonElement element, ModelReaderWriterOptions options)
+        internal static Friend DeserializeFriend(System.Text.Json.JsonElement element, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            if (element.ValueKind == JsonValueKind.Null)
+            if (element.ValueKind == System.Text.Json.JsonValueKind.Null)
             {
                 return null;
             }
             string name = default;
-            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            IDictionary<string, System.BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, System.BinaryData>();
             foreach (var prop in element.EnumerateObject())
             {
                 if (prop.NameEquals("name"u8))
@@ -88,60 +88,60 @@ internal static Friend DeserializeFriend(JsonElement element, ModelReaderWriterO
                 }
                 if (options.Format != "W")
                 {
-                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, System.BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
             return new Friend(name, additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<Friend>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
+        System.BinaryData System.ClientModel.Primitives.IPersistableModel<Friend>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        protected virtual System.BinaryData PersistableModelWriteCore(System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<Friend>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<Friend>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    return ModelReaderWriter.Write(this, options);
+                    return System.ClientModel.Primitives.ModelReaderWriter.Write(this, options);
                 default:
                     throw new FormatException($"The model {nameof(Friend)} does not support writing '{options.Format}' format.");
             }
         }
 
-        Friend IPersistableModel<Friend>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
+        Friend System.ClientModel.Primitives.IPersistableModel<Friend>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
         /// <param name="data"> The data to parse. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual Friend PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        protected virtual Friend PersistableModelCreateCore(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<Friend>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<Friend>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    using (JsonDocument document = JsonDocument.Parse(data))
+                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(data))
                     {
-                        return DeserializeFriend(document.RootElement, options);
+                        return Friend.DeserializeFriend(document.RootElement, options);
                     }
                 default:
                     throw new FormatException($"The model {nameof(Friend)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<Friend>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string System.ClientModel.Primitives.IPersistableModel<Friend>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J";
 
-        /// <param name="friend"> The <see cref="Friend"/> to serialize into <see cref="BinaryContent"/>. </param>
+        /// <param name="friend"> The <see cref="Friend"/> to serialize into <see cref="System.ClientModel.BinaryContent"/>. </param>
         public static implicit operator BinaryContent(Friend friend)
         {
-            return BinaryContent.Create(friend, ModelSerializationExtensions.WireOptions);
+            return System.ClientModel.BinaryContent.Create(friend, ModelSerializationExtensions.WireOptions);
         }
 
-        /// <param name="result"> The <see cref="ClientResult"/> to deserialize the <see cref="Friend"/> from. </param>
-        public static explicit operator Friend(ClientResult result)
+        /// <param name="result"> The <see cref="System.ClientModel.ClientResult"/> to deserialize the <see cref="Friend"/> from. </param>
+        public static explicit operator Friend(System.ClientModel.ClientResult result)
         {
-            using PipelineResponse response = result.GetRawResponse();
-            using JsonDocument document = JsonDocument.Parse(response.Content);
-            return DeserializeFriend(document.RootElement, ModelSerializationExtensions.WireOptions);
+            using System.ClientModel.Primitives.PipelineResponse response = result.GetRawResponse();
+            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(response.Content);
+            return Friend.DeserializeFriend(document.RootElement, ModelSerializationExtensions.WireOptions);
         }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Friend.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Friend.cs
index ea7b538f4377d..9e2bf6f3e3f49 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Friend.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Friend.cs
@@ -10,24 +10,24 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary> this is not a friendly model but with a friendly name. </summary>
+    /// <summary> The Friend. </summary>
     public partial class Friend
     {
         /// <summary> Keeps track of any properties unknown to the library. </summary>
-        private protected IDictionary<string, BinaryData> _additionalBinaryDataProperties;
+        private protected IDictionary<string, System.BinaryData> _additionalBinaryDataProperties;
 
         internal Friend(string name)
         {
             Name = name;
         }
 
-        internal Friend(string name, IDictionary<string, BinaryData> additionalBinaryDataProperties)
+        internal Friend(string name, IDictionary<string, System.BinaryData> additionalBinaryDataProperties)
         {
             Name = name;
             _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
-        /// <summary> name of the NotFriend. </summary>
+        /// <summary> Gets or sets the Name. </summary>
         public string Name { get; set; }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FriendlyModelRequest.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FriendlyModelRequest.Serialization.cs
deleted file mode 100644
index f1c15ec6c68de..0000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FriendlyModelRequest.Serialization.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using BasicTypeSpec;
-
-namespace BasicTypeSpec.Models
-{
-    /// <summary></summary>
-    internal partial class FriendlyModelRequest : IJsonModel<FriendlyModelRequest>
-    {
-        internal FriendlyModelRequest()
-        {
-        }
-
-        void IJsonModel<FriendlyModelRequest>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            string format = options.Format == "W" ? ((IPersistableModel<FriendlyModelRequest>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(FriendlyModelRequest)} does not support writing '{format}' format.");
-            }
-            writer.WritePropertyName("name"u8);
-            writer.WriteStringValue(Name);
-            if (options.Format != "W" && _additionalBinaryDataProperties != null)
-            {
-                foreach (var item in _additionalBinaryDataProperties)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-                    writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        FriendlyModelRequest IJsonModel<FriendlyModelRequest>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
-
-        /// <param name="reader"> The JSON reader. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual FriendlyModelRequest JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            string format = options.Format == "W" ? ((IPersistableModel<FriendlyModelRequest>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(FriendlyModelRequest)} does not support reading '{format}' format.");
-            }
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeFriendlyModelRequest(document.RootElement, options);
-        }
-
-        internal static FriendlyModelRequest DeserializeFriendlyModelRequest(JsonElement element, ModelReaderWriterOptions options)
-        {
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string name = default;
-            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
-            foreach (var prop in element.EnumerateObject())
-            {
-                if (prop.NameEquals("name"u8))
-                {
-                    name = prop.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
-                }
-            }
-            return new FriendlyModelRequest(name, additionalBinaryDataProperties);
-        }
-
-        BinaryData IPersistableModel<FriendlyModelRequest>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
-
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
-        {
-            string format = options.Format == "W" ? ((IPersistableModel<FriendlyModelRequest>)this).GetFormatFromOptions(options) : options.Format;
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(FriendlyModelRequest)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        FriendlyModelRequest IPersistableModel<FriendlyModelRequest>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
-
-        /// <param name="data"> The data to parse. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual FriendlyModelRequest PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
-        {
-            string format = options.Format == "W" ? ((IPersistableModel<FriendlyModelRequest>)this).GetFormatFromOptions(options) : options.Format;
-            switch (format)
-            {
-                case "J":
-                    using (JsonDocument document = JsonDocument.Parse(data))
-                    {
-                        return DeserializeFriendlyModelRequest(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(FriendlyModelRequest)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<FriendlyModelRequest>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <param name="friendlyModelRequest"> The <see cref="FriendlyModelRequest"/> to serialize into <see cref="BinaryContent"/>. </param>
-        public static implicit operator BinaryContent(FriendlyModelRequest friendlyModelRequest)
-        {
-            return BinaryContent.Create(friendlyModelRequest, ModelSerializationExtensions.WireOptions);
-        }
-
-        /// <param name="result"> The <see cref="ClientResult"/> to deserialize the <see cref="FriendlyModelRequest"/> from. </param>
-        public static explicit operator FriendlyModelRequest(ClientResult result)
-        {
-            using PipelineResponse response = result.GetRawResponse();
-            using JsonDocument document = JsonDocument.Parse(response.Content);
-            return DeserializeFriendlyModelRequest(document.RootElement, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FriendlyModelRequest.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FriendlyModelRequest.cs
deleted file mode 100644
index 05277292620a8..0000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FriendlyModelRequest.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace BasicTypeSpec.Models
-{
-    /// <summary> The FriendlyModelRequest. </summary>
-    internal partial class FriendlyModelRequest
-    {
-        /// <summary> Keeps track of any properties unknown to the library. </summary>
-        private protected IDictionary<string, BinaryData> _additionalBinaryDataProperties;
-
-        internal FriendlyModelRequest(string name)
-        {
-            Name = name;
-        }
-
-        internal FriendlyModelRequest(string name, IDictionary<string, BinaryData> additionalBinaryDataProperties)
-        {
-            Name = name;
-            _additionalBinaryDataProperties = additionalBinaryDataProperties;
-        }
-
-        /// <summary> name of the NotFriend. </summary>
-        public string Name { get; set; }
-    }
-}
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/IntExtensibleEnum.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/IntExtensibleEnum.cs
index 70662256d1a8d..74d793b07ad22 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/IntExtensibleEnum.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/IntExtensibleEnum.cs
@@ -11,7 +11,7 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary> Int based extensible enum. </summary>
+    /// <summary></summary>
     public readonly partial struct IntExtensibleEnum : IEquatable<IntExtensibleEnum>
     {
         private readonly int _value;
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/IntFixedEnum.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/IntFixedEnum.cs
index 8e88904ce2c57..1b63303cdb2a3 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/IntFixedEnum.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/IntFixedEnum.cs
@@ -7,7 +7,7 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary> int fixed enum. </summary>
+    /// <summary></summary>
     public enum IntFixedEnum
     {
         /// <summary> One. </summary>
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.Serialization.cs
index a84cef90e170d..9f8f31adf5f3e 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.Serialization.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.Serialization.cs
@@ -15,13 +15,13 @@
 namespace BasicTypeSpec.Models
 {
     /// <summary></summary>
-    public partial class ModelWithRequiredNullableProperties : IJsonModel<ModelWithRequiredNullableProperties>
+    public partial class ModelWithRequiredNullableProperties : System.ClientModel.Primitives.IJsonModel<ModelWithRequiredNullableProperties>
     {
         internal ModelWithRequiredNullableProperties()
         {
         }
 
-        void IJsonModel<ModelWithRequiredNullableProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void System.ClientModel.Primitives.IJsonModel<ModelWithRequiredNullableProperties>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -30,9 +30,9 @@ void IJsonModel<ModelWithRequiredNullableProperties>.Write(Utf8JsonWriter writer
 
         /// <param name="writer"> The JSON writer. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<ModelWithRequiredNullableProperties>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ModelWithRequiredNullableProperties>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(ModelWithRequiredNullableProperties)} does not support writing '{format}' format.");
@@ -72,45 +72,45 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
 #if NET6_0_OR_GREATER
                     writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(item.Value))
                     {
-                        JsonSerializer.Serialize(writer, document.RootElement);
+                        System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
                     }
 #endif
                 }
             }
         }
 
-        ModelWithRequiredNullableProperties IJsonModel<ModelWithRequiredNullableProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+        ModelWithRequiredNullableProperties System.ClientModel.Primitives.IJsonModel<ModelWithRequiredNullableProperties>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
 
         /// <param name="reader"> The JSON reader. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual ModelWithRequiredNullableProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        protected virtual ModelWithRequiredNullableProperties JsonModelCreateCore(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<ModelWithRequiredNullableProperties>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ModelWithRequiredNullableProperties>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(ModelWithRequiredNullableProperties)} does not support reading '{format}' format.");
             }
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeModelWithRequiredNullableProperties(document.RootElement, options);
+            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.ParseValue(ref reader);
+            return ModelWithRequiredNullableProperties.DeserializeModelWithRequiredNullableProperties(document.RootElement, options);
         }
 
-        internal static ModelWithRequiredNullableProperties DeserializeModelWithRequiredNullableProperties(JsonElement element, ModelReaderWriterOptions options)
+        internal static ModelWithRequiredNullableProperties DeserializeModelWithRequiredNullableProperties(System.Text.Json.JsonElement element, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            if (element.ValueKind == JsonValueKind.Null)
+            if (element.ValueKind == System.Text.Json.JsonValueKind.Null)
             {
                 return null;
             }
             int? requiredNullablePrimitive = default;
             StringExtensibleEnum? requiredExtensibleEnum = default;
             StringFixedEnum? requiredFixedEnum = default;
-            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            IDictionary<string, System.BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, System.BinaryData>();
             foreach (var prop in element.EnumerateObject())
             {
                 if (prop.NameEquals("requiredNullablePrimitive"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         requiredNullablePrimitive = null;
                         continue;
@@ -120,7 +120,7 @@ internal static ModelWithRequiredNullableProperties DeserializeModelWithRequired
                 }
                 if (prop.NameEquals("requiredExtensibleEnum"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         requiredExtensibleEnum = null;
                         continue;
@@ -130,7 +130,7 @@ internal static ModelWithRequiredNullableProperties DeserializeModelWithRequired
                 }
                 if (prop.NameEquals("requiredFixedEnum"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         requiredFixedEnum = null;
                         continue;
@@ -140,60 +140,60 @@ internal static ModelWithRequiredNullableProperties DeserializeModelWithRequired
                 }
                 if (options.Format != "W")
                 {
-                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, System.BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
             return new ModelWithRequiredNullableProperties(requiredNullablePrimitive, requiredExtensibleEnum, requiredFixedEnum, additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<ModelWithRequiredNullableProperties>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
+        System.BinaryData System.ClientModel.Primitives.IPersistableModel<ModelWithRequiredNullableProperties>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        protected virtual System.BinaryData PersistableModelWriteCore(System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<ModelWithRequiredNullableProperties>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ModelWithRequiredNullableProperties>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    return ModelReaderWriter.Write(this, options);
+                    return System.ClientModel.Primitives.ModelReaderWriter.Write(this, options);
                 default:
                     throw new FormatException($"The model {nameof(ModelWithRequiredNullableProperties)} does not support writing '{options.Format}' format.");
             }
         }
 
-        ModelWithRequiredNullableProperties IPersistableModel<ModelWithRequiredNullableProperties>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
+        ModelWithRequiredNullableProperties System.ClientModel.Primitives.IPersistableModel<ModelWithRequiredNullableProperties>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
         /// <param name="data"> The data to parse. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual ModelWithRequiredNullableProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        protected virtual ModelWithRequiredNullableProperties PersistableModelCreateCore(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<ModelWithRequiredNullableProperties>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ModelWithRequiredNullableProperties>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    using (JsonDocument document = JsonDocument.Parse(data))
+                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(data))
                     {
-                        return DeserializeModelWithRequiredNullableProperties(document.RootElement, options);
+                        return ModelWithRequiredNullableProperties.DeserializeModelWithRequiredNullableProperties(document.RootElement, options);
                     }
                 default:
                     throw new FormatException($"The model {nameof(ModelWithRequiredNullableProperties)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<ModelWithRequiredNullableProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string System.ClientModel.Primitives.IPersistableModel<ModelWithRequiredNullableProperties>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J";
 
-        /// <param name="modelWithRequiredNullableProperties"> The <see cref="ModelWithRequiredNullableProperties"/> to serialize into <see cref="BinaryContent"/>. </param>
+        /// <param name="modelWithRequiredNullableProperties"> The <see cref="ModelWithRequiredNullableProperties"/> to serialize into <see cref="System.ClientModel.BinaryContent"/>. </param>
         public static implicit operator BinaryContent(ModelWithRequiredNullableProperties modelWithRequiredNullableProperties)
         {
-            return BinaryContent.Create(modelWithRequiredNullableProperties, ModelSerializationExtensions.WireOptions);
+            return System.ClientModel.BinaryContent.Create(modelWithRequiredNullableProperties, ModelSerializationExtensions.WireOptions);
         }
 
-        /// <param name="result"> The <see cref="ClientResult"/> to deserialize the <see cref="ModelWithRequiredNullableProperties"/> from. </param>
-        public static explicit operator ModelWithRequiredNullableProperties(ClientResult result)
+        /// <param name="result"> The <see cref="System.ClientModel.ClientResult"/> to deserialize the <see cref="ModelWithRequiredNullableProperties"/> from. </param>
+        public static explicit operator ModelWithRequiredNullableProperties(System.ClientModel.ClientResult result)
         {
-            using PipelineResponse response = result.GetRawResponse();
-            using JsonDocument document = JsonDocument.Parse(response.Content);
-            return DeserializeModelWithRequiredNullableProperties(document.RootElement, ModelSerializationExtensions.WireOptions);
+            using System.ClientModel.Primitives.PipelineResponse response = result.GetRawResponse();
+            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(response.Content);
+            return ModelWithRequiredNullableProperties.DeserializeModelWithRequiredNullableProperties(document.RootElement, ModelSerializationExtensions.WireOptions);
         }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.cs
index 3f743baad339c..cfc394e7edbec 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.cs
@@ -10,16 +10,16 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary> A model with a few required nullable properties. </summary>
+    /// <summary> The ModelWithRequiredNullableProperties. </summary>
     public partial class ModelWithRequiredNullableProperties
     {
         /// <summary> Keeps track of any properties unknown to the library. </summary>
-        private protected IDictionary<string, BinaryData> _additionalBinaryDataProperties;
+        private protected IDictionary<string, System.BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="ModelWithRequiredNullableProperties"/>. </summary>
-        /// <param name="requiredNullablePrimitive"> required nullable primitive type. </param>
-        /// <param name="requiredExtensibleEnum"> required nullable extensible enum type. </param>
-        /// <param name="requiredFixedEnum"> required nullable fixed enum type. </param>
+        /// <param name="requiredNullablePrimitive"></param>
+        /// <param name="requiredExtensibleEnum"></param>
+        /// <param name="requiredFixedEnum"></param>
         public ModelWithRequiredNullableProperties(int? requiredNullablePrimitive, StringExtensibleEnum? requiredExtensibleEnum, StringFixedEnum? requiredFixedEnum)
         {
             RequiredNullablePrimitive = requiredNullablePrimitive;
@@ -27,7 +27,7 @@ public ModelWithRequiredNullableProperties(int? requiredNullablePrimitive, Strin
             RequiredFixedEnum = requiredFixedEnum;
         }
 
-        internal ModelWithRequiredNullableProperties(int? requiredNullablePrimitive, StringExtensibleEnum? requiredExtensibleEnum, StringFixedEnum? requiredFixedEnum, IDictionary<string, BinaryData> additionalBinaryDataProperties)
+        internal ModelWithRequiredNullableProperties(int? requiredNullablePrimitive, StringExtensibleEnum? requiredExtensibleEnum, StringFixedEnum? requiredFixedEnum, IDictionary<string, System.BinaryData> additionalBinaryDataProperties)
         {
             RequiredNullablePrimitive = requiredNullablePrimitive;
             RequiredExtensibleEnum = requiredExtensibleEnum;
@@ -35,13 +35,13 @@ internal ModelWithRequiredNullableProperties(int? requiredNullablePrimitive, Str
             _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
-        /// <summary> required nullable primitive type. </summary>
+        /// <summary> Gets or sets the RequiredNullablePrimitive. </summary>
         public int? RequiredNullablePrimitive { get; set; }
 
-        /// <summary> required nullable extensible enum type. </summary>
+        /// <summary> Gets or sets the RequiredExtensibleEnum. </summary>
         public StringExtensibleEnum? RequiredExtensibleEnum { get; set; }
 
-        /// <summary> required nullable fixed enum type. </summary>
+        /// <summary> Gets or sets the RequiredFixedEnum. </summary>
         public StringFixedEnum? RequiredFixedEnum { get; set; }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedModel.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedModel.Serialization.cs
index 519e2c3d1a946..07d103bdaa1d0 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedModel.Serialization.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedModel.Serialization.cs
@@ -15,13 +15,13 @@
 namespace BasicTypeSpec.Models
 {
     /// <summary></summary>
-    public partial class ProjectedModel : IJsonModel<ProjectedModel>
+    public partial class ProjectedModel : System.ClientModel.Primitives.IJsonModel<ProjectedModel>
     {
         internal ProjectedModel()
         {
         }
 
-        void IJsonModel<ProjectedModel>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void System.ClientModel.Primitives.IJsonModel<ProjectedModel>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -30,9 +30,9 @@ void IJsonModel<ProjectedModel>.Write(Utf8JsonWriter writer, ModelReaderWriterOp
 
         /// <param name="writer"> The JSON writer. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<ProjectedModel>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ProjectedModel>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(ProjectedModel)} does not support writing '{format}' format.");
@@ -47,38 +47,38 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
 #if NET6_0_OR_GREATER
                     writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(item.Value))
                     {
-                        JsonSerializer.Serialize(writer, document.RootElement);
+                        System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
                     }
 #endif
                 }
             }
         }
 
-        ProjectedModel IJsonModel<ProjectedModel>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+        ProjectedModel System.ClientModel.Primitives.IJsonModel<ProjectedModel>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
 
         /// <param name="reader"> The JSON reader. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual ProjectedModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        protected virtual ProjectedModel JsonModelCreateCore(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<ProjectedModel>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ProjectedModel>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(ProjectedModel)} does not support reading '{format}' format.");
             }
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeProjectedModel(document.RootElement, options);
+            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.ParseValue(ref reader);
+            return ProjectedModel.DeserializeProjectedModel(document.RootElement, options);
         }
 
-        internal static ProjectedModel DeserializeProjectedModel(JsonElement element, ModelReaderWriterOptions options)
+        internal static ProjectedModel DeserializeProjectedModel(System.Text.Json.JsonElement element, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            if (element.ValueKind == JsonValueKind.Null)
+            if (element.ValueKind == System.Text.Json.JsonValueKind.Null)
             {
                 return null;
             }
             string name = default;
-            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            IDictionary<string, System.BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, System.BinaryData>();
             foreach (var prop in element.EnumerateObject())
             {
                 if (prop.NameEquals("name"u8))
@@ -88,60 +88,60 @@ internal static ProjectedModel DeserializeProjectedModel(JsonElement element, Mo
                 }
                 if (options.Format != "W")
                 {
-                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, System.BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
             return new ProjectedModel(name, additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<ProjectedModel>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
+        System.BinaryData System.ClientModel.Primitives.IPersistableModel<ProjectedModel>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        protected virtual System.BinaryData PersistableModelWriteCore(System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<ProjectedModel>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ProjectedModel>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    return ModelReaderWriter.Write(this, options);
+                    return System.ClientModel.Primitives.ModelReaderWriter.Write(this, options);
                 default:
                     throw new FormatException($"The model {nameof(ProjectedModel)} does not support writing '{options.Format}' format.");
             }
         }
 
-        ProjectedModel IPersistableModel<ProjectedModel>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
+        ProjectedModel System.ClientModel.Primitives.IPersistableModel<ProjectedModel>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
         /// <param name="data"> The data to parse. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual ProjectedModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        protected virtual ProjectedModel PersistableModelCreateCore(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<ProjectedModel>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ProjectedModel>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    using (JsonDocument document = JsonDocument.Parse(data))
+                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(data))
                     {
-                        return DeserializeProjectedModel(document.RootElement, options);
+                        return ProjectedModel.DeserializeProjectedModel(document.RootElement, options);
                     }
                 default:
                     throw new FormatException($"The model {nameof(ProjectedModel)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<ProjectedModel>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string System.ClientModel.Primitives.IPersistableModel<ProjectedModel>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J";
 
-        /// <param name="projectedModel"> The <see cref="ProjectedModel"/> to serialize into <see cref="BinaryContent"/>. </param>
+        /// <param name="projectedModel"> The <see cref="ProjectedModel"/> to serialize into <see cref="System.ClientModel.BinaryContent"/>. </param>
         public static implicit operator BinaryContent(ProjectedModel projectedModel)
         {
-            return BinaryContent.Create(projectedModel, ModelSerializationExtensions.WireOptions);
+            return System.ClientModel.BinaryContent.Create(projectedModel, ModelSerializationExtensions.WireOptions);
         }
 
-        /// <param name="result"> The <see cref="ClientResult"/> to deserialize the <see cref="ProjectedModel"/> from. </param>
-        public static explicit operator ProjectedModel(ClientResult result)
+        /// <param name="result"> The <see cref="System.ClientModel.ClientResult"/> to deserialize the <see cref="ProjectedModel"/> from. </param>
+        public static explicit operator ProjectedModel(System.ClientModel.ClientResult result)
         {
-            using PipelineResponse response = result.GetRawResponse();
-            using JsonDocument document = JsonDocument.Parse(response.Content);
-            return DeserializeProjectedModel(document.RootElement, ModelSerializationExtensions.WireOptions);
+            using System.ClientModel.Primitives.PipelineResponse response = result.GetRawResponse();
+            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(response.Content);
+            return ProjectedModel.DeserializeProjectedModel(document.RootElement, ModelSerializationExtensions.WireOptions);
         }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedModel.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedModel.cs
index d9a5e5895d01a..40700ea3afa53 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedModel.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedModel.cs
@@ -10,24 +10,24 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary> this is a model with a projected name. </summary>
+    /// <summary> The ProjectedModel. </summary>
     public partial class ProjectedModel
     {
         /// <summary> Keeps track of any properties unknown to the library. </summary>
-        private protected IDictionary<string, BinaryData> _additionalBinaryDataProperties;
+        private protected IDictionary<string, System.BinaryData> _additionalBinaryDataProperties;
 
         internal ProjectedModel(string name)
         {
             Name = name;
         }
 
-        internal ProjectedModel(string name, IDictionary<string, BinaryData> additionalBinaryDataProperties)
+        internal ProjectedModel(string name, IDictionary<string, System.BinaryData> additionalBinaryDataProperties)
         {
             Name = name;
             _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
-        /// <summary> name of the ModelWithProjectedName. </summary>
+        /// <summary> Gets or sets the Name. </summary>
         public string Name { get; set; }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedNameModelRequest.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedNameModelRequest.Serialization.cs
deleted file mode 100644
index 246799949b78b..0000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedNameModelRequest.Serialization.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.ClientModel;
-using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Text.Json;
-using BasicTypeSpec;
-
-namespace BasicTypeSpec.Models
-{
-    /// <summary></summary>
-    internal partial class ProjectedNameModelRequest : IJsonModel<ProjectedNameModelRequest>
-    {
-        internal ProjectedNameModelRequest()
-        {
-        }
-
-        void IJsonModel<ProjectedNameModelRequest>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            writer.WriteStartObject();
-            JsonModelWriteCore(writer, options);
-            writer.WriteEndObject();
-        }
-
-        /// <param name="writer"> The JSON writer. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
-        {
-            string format = options.Format == "W" ? ((IPersistableModel<ProjectedNameModelRequest>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ProjectedNameModelRequest)} does not support writing '{format}' format.");
-            }
-            writer.WritePropertyName("name"u8);
-            writer.WriteStringValue(Name);
-            if (options.Format != "W" && _additionalBinaryDataProperties != null)
-            {
-                foreach (var item in _additionalBinaryDataProperties)
-                {
-                    writer.WritePropertyName(item.Key);
-#if NET6_0_OR_GREATER
-                    writer.WriteRawValue(item.Value);
-#else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
-                    {
-                        JsonSerializer.Serialize(writer, document.RootElement);
-                    }
-#endif
-                }
-            }
-        }
-
-        ProjectedNameModelRequest IJsonModel<ProjectedNameModelRequest>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
-
-        /// <param name="reader"> The JSON reader. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual ProjectedNameModelRequest JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
-        {
-            string format = options.Format == "W" ? ((IPersistableModel<ProjectedNameModelRequest>)this).GetFormatFromOptions(options) : options.Format;
-            if (format != "J")
-            {
-                throw new FormatException($"The model {nameof(ProjectedNameModelRequest)} does not support reading '{format}' format.");
-            }
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeProjectedNameModelRequest(document.RootElement, options);
-        }
-
-        internal static ProjectedNameModelRequest DeserializeProjectedNameModelRequest(JsonElement element, ModelReaderWriterOptions options)
-        {
-            if (element.ValueKind == JsonValueKind.Null)
-            {
-                return null;
-            }
-            string name = default;
-            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
-            foreach (var prop in element.EnumerateObject())
-            {
-                if (prop.NameEquals("name"u8))
-                {
-                    name = prop.Value.GetString();
-                    continue;
-                }
-                if (options.Format != "W")
-                {
-                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
-                }
-            }
-            return new ProjectedNameModelRequest(name, additionalBinaryDataProperties);
-        }
-
-        BinaryData IPersistableModel<ProjectedNameModelRequest>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
-
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
-        {
-            string format = options.Format == "W" ? ((IPersistableModel<ProjectedNameModelRequest>)this).GetFormatFromOptions(options) : options.Format;
-            switch (format)
-            {
-                case "J":
-                    return ModelReaderWriter.Write(this, options);
-                default:
-                    throw new FormatException($"The model {nameof(ProjectedNameModelRequest)} does not support writing '{options.Format}' format.");
-            }
-        }
-
-        ProjectedNameModelRequest IPersistableModel<ProjectedNameModelRequest>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
-
-        /// <param name="data"> The data to parse. </param>
-        /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual ProjectedNameModelRequest PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
-        {
-            string format = options.Format == "W" ? ((IPersistableModel<ProjectedNameModelRequest>)this).GetFormatFromOptions(options) : options.Format;
-            switch (format)
-            {
-                case "J":
-                    using (JsonDocument document = JsonDocument.Parse(data))
-                    {
-                        return DeserializeProjectedNameModelRequest(document.RootElement, options);
-                    }
-                default:
-                    throw new FormatException($"The model {nameof(ProjectedNameModelRequest)} does not support reading '{options.Format}' format.");
-            }
-        }
-
-        string IPersistableModel<ProjectedNameModelRequest>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
-
-        /// <param name="projectedNameModelRequest"> The <see cref="ProjectedNameModelRequest"/> to serialize into <see cref="BinaryContent"/>. </param>
-        public static implicit operator BinaryContent(ProjectedNameModelRequest projectedNameModelRequest)
-        {
-            return BinaryContent.Create(projectedNameModelRequest, ModelSerializationExtensions.WireOptions);
-        }
-
-        /// <param name="result"> The <see cref="ClientResult"/> to deserialize the <see cref="ProjectedNameModelRequest"/> from. </param>
-        public static explicit operator ProjectedNameModelRequest(ClientResult result)
-        {
-            using PipelineResponse response = result.GetRawResponse();
-            using JsonDocument document = JsonDocument.Parse(response.Content);
-            return DeserializeProjectedNameModelRequest(document.RootElement, ModelSerializationExtensions.WireOptions);
-        }
-    }
-}
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedNameModelRequest.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedNameModelRequest.cs
deleted file mode 100644
index 21f8f0ba96784..0000000000000
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedNameModelRequest.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-// <auto-generated/>
-
-#nullable disable
-
-using System;
-using System.Collections.Generic;
-
-namespace BasicTypeSpec.Models
-{
-    /// <summary> The ProjectedNameModelRequest. </summary>
-    internal partial class ProjectedNameModelRequest
-    {
-        /// <summary> Keeps track of any properties unknown to the library. </summary>
-        private protected IDictionary<string, BinaryData> _additionalBinaryDataProperties;
-
-        internal ProjectedNameModelRequest(string name)
-        {
-            Name = name;
-        }
-
-        internal ProjectedNameModelRequest(string name, IDictionary<string, BinaryData> additionalBinaryDataProperties)
-        {
-            Name = name;
-            _additionalBinaryDataProperties = additionalBinaryDataProperties;
-        }
-
-        /// <summary> name of the ModelWithProjectedName. </summary>
-        public string Name { get; set; }
-    }
-}
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.Serialization.cs
index 3bcdfe6ccf292..805c821f6e401 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.Serialization.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.Serialization.cs
@@ -15,9 +15,9 @@
 namespace BasicTypeSpec.Models
 {
     /// <summary></summary>
-    public partial class ReturnsAnonymousModelResponse : IJsonModel<ReturnsAnonymousModelResponse>
+    public partial class ReturnsAnonymousModelResponse : System.ClientModel.Primitives.IJsonModel<ReturnsAnonymousModelResponse>
     {
-        void IJsonModel<ReturnsAnonymousModelResponse>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void System.ClientModel.Primitives.IJsonModel<ReturnsAnonymousModelResponse>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -26,9 +26,9 @@ void IJsonModel<ReturnsAnonymousModelResponse>.Write(Utf8JsonWriter writer, Mode
 
         /// <param name="writer"> The JSON writer. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<ReturnsAnonymousModelResponse>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ReturnsAnonymousModelResponse>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(ReturnsAnonymousModelResponse)} does not support writing '{format}' format.");
@@ -41,95 +41,95 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
 #if NET6_0_OR_GREATER
                     writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(item.Value))
                     {
-                        JsonSerializer.Serialize(writer, document.RootElement);
+                        System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
                     }
 #endif
                 }
             }
         }
 
-        ReturnsAnonymousModelResponse IJsonModel<ReturnsAnonymousModelResponse>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+        ReturnsAnonymousModelResponse System.ClientModel.Primitives.IJsonModel<ReturnsAnonymousModelResponse>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
 
         /// <param name="reader"> The JSON reader. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual ReturnsAnonymousModelResponse JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        protected virtual ReturnsAnonymousModelResponse JsonModelCreateCore(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<ReturnsAnonymousModelResponse>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ReturnsAnonymousModelResponse>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(ReturnsAnonymousModelResponse)} does not support reading '{format}' format.");
             }
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeReturnsAnonymousModelResponse(document.RootElement, options);
+            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.ParseValue(ref reader);
+            return ReturnsAnonymousModelResponse.DeserializeReturnsAnonymousModelResponse(document.RootElement, options);
         }
 
-        internal static ReturnsAnonymousModelResponse DeserializeReturnsAnonymousModelResponse(JsonElement element, ModelReaderWriterOptions options)
+        internal static ReturnsAnonymousModelResponse DeserializeReturnsAnonymousModelResponse(System.Text.Json.JsonElement element, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            if (element.ValueKind == JsonValueKind.Null)
+            if (element.ValueKind == System.Text.Json.JsonValueKind.Null)
             {
                 return null;
             }
-            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            IDictionary<string, System.BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, System.BinaryData>();
             foreach (var prop in element.EnumerateObject())
             {
                 if (options.Format != "W")
                 {
-                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, System.BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
             return new ReturnsAnonymousModelResponse(additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<ReturnsAnonymousModelResponse>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
+        System.BinaryData System.ClientModel.Primitives.IPersistableModel<ReturnsAnonymousModelResponse>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        protected virtual System.BinaryData PersistableModelWriteCore(System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<ReturnsAnonymousModelResponse>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ReturnsAnonymousModelResponse>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    return ModelReaderWriter.Write(this, options);
+                    return System.ClientModel.Primitives.ModelReaderWriter.Write(this, options);
                 default:
                     throw new FormatException($"The model {nameof(ReturnsAnonymousModelResponse)} does not support writing '{options.Format}' format.");
             }
         }
 
-        ReturnsAnonymousModelResponse IPersistableModel<ReturnsAnonymousModelResponse>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
+        ReturnsAnonymousModelResponse System.ClientModel.Primitives.IPersistableModel<ReturnsAnonymousModelResponse>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
         /// <param name="data"> The data to parse. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual ReturnsAnonymousModelResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        protected virtual ReturnsAnonymousModelResponse PersistableModelCreateCore(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<ReturnsAnonymousModelResponse>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ReturnsAnonymousModelResponse>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    using (JsonDocument document = JsonDocument.Parse(data))
+                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(data))
                     {
-                        return DeserializeReturnsAnonymousModelResponse(document.RootElement, options);
+                        return ReturnsAnonymousModelResponse.DeserializeReturnsAnonymousModelResponse(document.RootElement, options);
                     }
                 default:
                     throw new FormatException($"The model {nameof(ReturnsAnonymousModelResponse)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<ReturnsAnonymousModelResponse>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string System.ClientModel.Primitives.IPersistableModel<ReturnsAnonymousModelResponse>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J";
 
-        /// <param name="returnsAnonymousModelResponse"> The <see cref="ReturnsAnonymousModelResponse"/> to serialize into <see cref="BinaryContent"/>. </param>
+        /// <param name="returnsAnonymousModelResponse"> The <see cref="ReturnsAnonymousModelResponse"/> to serialize into <see cref="System.ClientModel.BinaryContent"/>. </param>
         public static implicit operator BinaryContent(ReturnsAnonymousModelResponse returnsAnonymousModelResponse)
         {
-            return BinaryContent.Create(returnsAnonymousModelResponse, ModelSerializationExtensions.WireOptions);
+            return System.ClientModel.BinaryContent.Create(returnsAnonymousModelResponse, ModelSerializationExtensions.WireOptions);
         }
 
-        /// <param name="result"> The <see cref="ClientResult"/> to deserialize the <see cref="ReturnsAnonymousModelResponse"/> from. </param>
-        public static explicit operator ReturnsAnonymousModelResponse(ClientResult result)
+        /// <param name="result"> The <see cref="System.ClientModel.ClientResult"/> to deserialize the <see cref="ReturnsAnonymousModelResponse"/> from. </param>
+        public static explicit operator ReturnsAnonymousModelResponse(System.ClientModel.ClientResult result)
         {
-            using PipelineResponse response = result.GetRawResponse();
-            using JsonDocument document = JsonDocument.Parse(response.Content);
-            return DeserializeReturnsAnonymousModelResponse(document.RootElement, ModelSerializationExtensions.WireOptions);
+            using System.ClientModel.Primitives.PipelineResponse response = result.GetRawResponse();
+            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(response.Content);
+            return ReturnsAnonymousModelResponse.DeserializeReturnsAnonymousModelResponse(document.RootElement, ModelSerializationExtensions.WireOptions);
         }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.cs
index 68974991df3d2..496cc4d6302cd 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.cs
@@ -14,13 +14,13 @@ namespace BasicTypeSpec.Models
     public partial class ReturnsAnonymousModelResponse
     {
         /// <summary> Keeps track of any properties unknown to the library. </summary>
-        private protected IDictionary<string, BinaryData> _additionalBinaryDataProperties;
+        private protected IDictionary<string, System.BinaryData> _additionalBinaryDataProperties;
 
         internal ReturnsAnonymousModelResponse()
         {
         }
 
-        internal ReturnsAnonymousModelResponse(IDictionary<string, BinaryData> additionalBinaryDataProperties)
+        internal ReturnsAnonymousModelResponse(IDictionary<string, System.BinaryData> additionalBinaryDataProperties)
         {
             _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/RoundTripModel.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/RoundTripModel.Serialization.cs
index 94a684ae8ed29..48cbf1d441e61 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/RoundTripModel.Serialization.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/RoundTripModel.Serialization.cs
@@ -15,13 +15,13 @@
 namespace BasicTypeSpec.Models
 {
     /// <summary></summary>
-    public partial class RoundTripModel : IJsonModel<RoundTripModel>
+    public partial class RoundTripModel : System.ClientModel.Primitives.IJsonModel<RoundTripModel>
     {
         internal RoundTripModel()
         {
         }
 
-        void IJsonModel<RoundTripModel>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void System.ClientModel.Primitives.IJsonModel<RoundTripModel>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -30,9 +30,9 @@ void IJsonModel<RoundTripModel>.Write(Utf8JsonWriter writer, ModelReaderWriterOp
 
         /// <param name="writer"> The JSON writer. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<RoundTripModel>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<RoundTripModel>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(RoundTripModel)} does not support writing '{format}' format.");
@@ -43,7 +43,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             writer.WriteNumberValue(RequiredInt);
             writer.WritePropertyName("requiredCollection"u8);
             writer.WriteStartArray();
-            foreach (var item in RequiredCollection)
+            foreach (StringFixedEnum item in RequiredCollection)
             {
                 writer.WriteStringValue(item.ToSerialString());
             }
@@ -67,7 +67,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("intExtensibleEnumCollection"u8);
                 writer.WriteStartArray();
-                foreach (var item in IntExtensibleEnumCollection)
+                foreach (IntExtensibleEnum item in IntExtensibleEnumCollection)
                 {
                     writer.WriteNumberValue(item.ToSerialInt32());
                 }
@@ -87,7 +87,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("floatExtensibleEnumCollection"u8);
                 writer.WriteStartArray();
-                foreach (var item in FloatExtensibleEnumCollection)
+                foreach (FloatExtensibleEnum item in FloatExtensibleEnumCollection)
                 {
                     writer.WriteNumberValue(item.ToSerialSingle());
                 }
@@ -107,7 +107,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("floatFixedEnumCollection"u8);
                 writer.WriteStartArray();
-                foreach (var item in FloatFixedEnumCollection)
+                foreach (FloatFixedEnum item in FloatFixedEnumCollection)
                 {
                     writer.WriteNumberValue(item.ToSerialSingle());
                 }
@@ -122,7 +122,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("intFixedEnumCollection"u8);
                 writer.WriteStartArray();
-                foreach (var item in IntFixedEnumCollection)
+                foreach (IntFixedEnum item in IntFixedEnumCollection)
                 {
                     writer.WriteNumberValue((int)item);
                 }
@@ -137,9 +137,9 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
 #if NET6_0_OR_GREATER
             writer.WriteRawValue(RequiredUnknown);
 #else
-            using (JsonDocument document = JsonDocument.Parse(RequiredUnknown))
+            using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(RequiredUnknown))
             {
-                JsonSerializer.Serialize(writer, document.RootElement);
+                System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
             }
 #endif
             if (Optional.IsDefined(OptionalUnknown))
@@ -148,9 +148,9 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
 #if NET6_0_OR_GREATER
                 writer.WriteRawValue(OptionalUnknown);
 #else
-                using (JsonDocument document = JsonDocument.Parse(OptionalUnknown))
+                using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(OptionalUnknown))
                 {
-                    JsonSerializer.Serialize(writer, document.RootElement);
+                    System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
                 }
 #endif
             }
@@ -167,9 +167,9 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
 #if NET6_0_OR_GREATER
                 writer.WriteRawValue(item.Value);
 #else
-                using (JsonDocument document = JsonDocument.Parse(item.Value))
+                using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(item.Value))
                 {
-                    JsonSerializer.Serialize(writer, document.RootElement);
+                    System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
                 }
 #endif
             }
@@ -189,9 +189,9 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
 #if NET6_0_OR_GREATER
                     writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(item.Value))
                     {
-                        JsonSerializer.Serialize(writer, document.RootElement);
+                        System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
                     }
 #endif
                 }
@@ -212,9 +212,9 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
 #if NET6_0_OR_GREATER
                     writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(item.Value))
                     {
-                        JsonSerializer.Serialize(writer, document.RootElement);
+                        System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
                     }
 #endif
                 }
@@ -235,9 +235,9 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
 #if NET6_0_OR_GREATER
                     writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(item.Value))
                     {
-                        JsonSerializer.Serialize(writer, document.RootElement);
+                        System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
                     }
 #endif
                 }
@@ -255,33 +255,33 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
 #if NET6_0_OR_GREATER
                     writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(item.Value))
                     {
-                        JsonSerializer.Serialize(writer, document.RootElement);
+                        System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
                     }
 #endif
                 }
             }
         }
 
-        RoundTripModel IJsonModel<RoundTripModel>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+        RoundTripModel System.ClientModel.Primitives.IJsonModel<RoundTripModel>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
 
         /// <param name="reader"> The JSON reader. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual RoundTripModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        protected virtual RoundTripModel JsonModelCreateCore(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<RoundTripModel>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<RoundTripModel>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(RoundTripModel)} does not support reading '{format}' format.");
             }
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeRoundTripModel(document.RootElement, options);
+            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.ParseValue(ref reader);
+            return RoundTripModel.DeserializeRoundTripModel(document.RootElement, options);
         }
 
-        internal static RoundTripModel DeserializeRoundTripModel(JsonElement element, ModelReaderWriterOptions options)
+        internal static RoundTripModel DeserializeRoundTripModel(System.Text.Json.JsonElement element, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            if (element.ValueKind == JsonValueKind.Null)
+            if (element.ValueKind == System.Text.Json.JsonValueKind.Null)
             {
                 return null;
             }
@@ -301,15 +301,15 @@ internal static RoundTripModel DeserializeRoundTripModel(JsonElement element, Mo
             IntFixedEnum? intFixedEnum = default;
             IList<IntFixedEnum> intFixedEnumCollection = default;
             StringFixedEnum? stringFixedEnum = default;
-            BinaryData requiredUnknown = default;
-            BinaryData optionalUnknown = default;
-            IDictionary<string, BinaryData> requiredRecordUnknown = default;
-            IDictionary<string, BinaryData> optionalRecordUnknown = default;
-            IReadOnlyDictionary<string, BinaryData> readOnlyRequiredRecordUnknown = default;
-            IReadOnlyDictionary<string, BinaryData> readOnlyOptionalRecordUnknown = default;
+            System.BinaryData requiredUnknown = default;
+            System.BinaryData optionalUnknown = default;
+            IDictionary<string, System.BinaryData> requiredRecordUnknown = default;
+            IDictionary<string, System.BinaryData> optionalRecordUnknown = default;
+            IReadOnlyDictionary<string, System.BinaryData> readOnlyRequiredRecordUnknown = default;
+            IReadOnlyDictionary<string, System.BinaryData> readOnlyOptionalRecordUnknown = default;
             ModelWithRequiredNullableProperties modelWithRequiredNullable = default;
-            BinaryData requiredBytes = default;
-            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            System.BinaryData requiredBytes = default;
+            IDictionary<string, System.BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, System.BinaryData>();
             foreach (var prop in element.EnumerateObject())
             {
                 if (prop.NameEquals("requiredString"u8))
@@ -349,7 +349,7 @@ internal static RoundTripModel DeserializeRoundTripModel(JsonElement element, Mo
                 }
                 if (prop.NameEquals("intExtensibleEnum"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         intExtensibleEnum = null;
                         continue;
@@ -359,7 +359,7 @@ internal static RoundTripModel DeserializeRoundTripModel(JsonElement element, Mo
                 }
                 if (prop.NameEquals("intExtensibleEnumCollection"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         continue;
                     }
@@ -373,7 +373,7 @@ internal static RoundTripModel DeserializeRoundTripModel(JsonElement element, Mo
                 }
                 if (prop.NameEquals("floatExtensibleEnum"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         floatExtensibleEnum = null;
                         continue;
@@ -383,7 +383,7 @@ internal static RoundTripModel DeserializeRoundTripModel(JsonElement element, Mo
                 }
                 if (prop.NameEquals("floatExtensibleEnumWithIntValue"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         floatExtensibleEnumWithIntValue = null;
                         continue;
@@ -393,7 +393,7 @@ internal static RoundTripModel DeserializeRoundTripModel(JsonElement element, Mo
                 }
                 if (prop.NameEquals("floatExtensibleEnumCollection"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         continue;
                     }
@@ -407,7 +407,7 @@ internal static RoundTripModel DeserializeRoundTripModel(JsonElement element, Mo
                 }
                 if (prop.NameEquals("floatFixedEnum"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         floatFixedEnum = null;
                         continue;
@@ -417,7 +417,7 @@ internal static RoundTripModel DeserializeRoundTripModel(JsonElement element, Mo
                 }
                 if (prop.NameEquals("floatFixedEnumWithIntValue"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         floatFixedEnumWithIntValue = null;
                         continue;
@@ -427,7 +427,7 @@ internal static RoundTripModel DeserializeRoundTripModel(JsonElement element, Mo
                 }
                 if (prop.NameEquals("floatFixedEnumCollection"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         continue;
                     }
@@ -441,7 +441,7 @@ internal static RoundTripModel DeserializeRoundTripModel(JsonElement element, Mo
                 }
                 if (prop.NameEquals("intFixedEnum"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         intFixedEnum = null;
                         continue;
@@ -451,7 +451,7 @@ internal static RoundTripModel DeserializeRoundTripModel(JsonElement element, Mo
                 }
                 if (prop.NameEquals("intFixedEnumCollection"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         continue;
                     }
@@ -465,7 +465,7 @@ internal static RoundTripModel DeserializeRoundTripModel(JsonElement element, Mo
                 }
                 if (prop.NameEquals("stringFixedEnum"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         stringFixedEnum = null;
                         continue;
@@ -475,31 +475,31 @@ internal static RoundTripModel DeserializeRoundTripModel(JsonElement element, Mo
                 }
                 if (prop.NameEquals("requiredUnknown"u8))
                 {
-                    requiredUnknown = BinaryData.FromString(prop.Value.GetRawText());
+                    requiredUnknown = System.BinaryData.FromString(prop.Value.GetRawText());
                     continue;
                 }
                 if (prop.NameEquals("optionalUnknown"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         optionalUnknown = null;
                         continue;
                     }
-                    optionalUnknown = BinaryData.FromString(prop.Value.GetRawText());
+                    optionalUnknown = System.BinaryData.FromString(prop.Value.GetRawText());
                     continue;
                 }
                 if (prop.NameEquals("requiredRecordUnknown"u8))
                 {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                    Dictionary<string, System.BinaryData> dictionary = new Dictionary<string, System.BinaryData>();
                     foreach (var prop0 in prop.Value.EnumerateObject())
                     {
-                        if (prop0.Value.ValueKind == JsonValueKind.Null)
+                        if (prop0.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                         {
                             dictionary.Add(prop0.Name, null);
                         }
                         else
                         {
-                            dictionary.Add(prop0.Name, BinaryData.FromString(prop0.Value.GetRawText()));
+                            dictionary.Add(prop0.Name, System.BinaryData.FromString(prop0.Value.GetRawText()));
                         }
                     }
                     requiredRecordUnknown = dictionary;
@@ -507,20 +507,20 @@ internal static RoundTripModel DeserializeRoundTripModel(JsonElement element, Mo
                 }
                 if (prop.NameEquals("optionalRecordUnknown"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         continue;
                     }
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                    Dictionary<string, System.BinaryData> dictionary = new Dictionary<string, System.BinaryData>();
                     foreach (var prop0 in prop.Value.EnumerateObject())
                     {
-                        if (prop0.Value.ValueKind == JsonValueKind.Null)
+                        if (prop0.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                         {
                             dictionary.Add(prop0.Name, null);
                         }
                         else
                         {
-                            dictionary.Add(prop0.Name, BinaryData.FromString(prop0.Value.GetRawText()));
+                            dictionary.Add(prop0.Name, System.BinaryData.FromString(prop0.Value.GetRawText()));
                         }
                     }
                     optionalRecordUnknown = dictionary;
@@ -528,16 +528,16 @@ internal static RoundTripModel DeserializeRoundTripModel(JsonElement element, Mo
                 }
                 if (prop.NameEquals("readOnlyRequiredRecordUnknown"u8))
                 {
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                    Dictionary<string, System.BinaryData> dictionary = new Dictionary<string, System.BinaryData>();
                     foreach (var prop0 in prop.Value.EnumerateObject())
                     {
-                        if (prop0.Value.ValueKind == JsonValueKind.Null)
+                        if (prop0.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                         {
                             dictionary.Add(prop0.Name, null);
                         }
                         else
                         {
-                            dictionary.Add(prop0.Name, BinaryData.FromString(prop0.Value.GetRawText()));
+                            dictionary.Add(prop0.Name, System.BinaryData.FromString(prop0.Value.GetRawText()));
                         }
                     }
                     readOnlyRequiredRecordUnknown = dictionary;
@@ -545,20 +545,20 @@ internal static RoundTripModel DeserializeRoundTripModel(JsonElement element, Mo
                 }
                 if (prop.NameEquals("readOnlyOptionalRecordUnknown"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         continue;
                     }
-                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
+                    Dictionary<string, System.BinaryData> dictionary = new Dictionary<string, System.BinaryData>();
                     foreach (var prop0 in prop.Value.EnumerateObject())
                     {
-                        if (prop0.Value.ValueKind == JsonValueKind.Null)
+                        if (prop0.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                         {
                             dictionary.Add(prop0.Name, null);
                         }
                         else
                         {
-                            dictionary.Add(prop0.Name, BinaryData.FromString(prop0.Value.GetRawText()));
+                            dictionary.Add(prop0.Name, System.BinaryData.FromString(prop0.Value.GetRawText()));
                         }
                     }
                     readOnlyOptionalRecordUnknown = dictionary;
@@ -571,12 +571,12 @@ internal static RoundTripModel DeserializeRoundTripModel(JsonElement element, Mo
                 }
                 if (prop.NameEquals("requiredBytes"u8))
                 {
-                    requiredBytes = BinaryData.FromBytes(prop.Value.GetBytesFromBase64("D"));
+                    requiredBytes = System.BinaryData.FromBytes(prop.Value.GetBytesFromBase64("D"));
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, System.BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
             return new RoundTripModel(
@@ -599,62 +599,62 @@ internal static RoundTripModel DeserializeRoundTripModel(JsonElement element, Mo
                 requiredUnknown,
                 optionalUnknown,
                 requiredRecordUnknown,
-                optionalRecordUnknown ?? new ChangeTrackingDictionary<string, BinaryData>(),
+                optionalRecordUnknown ?? new ChangeTrackingDictionary<string, System.BinaryData>(),
                 readOnlyRequiredRecordUnknown,
-                readOnlyOptionalRecordUnknown ?? new ChangeTrackingDictionary<string, BinaryData>(),
+                readOnlyOptionalRecordUnknown ?? new ChangeTrackingDictionary<string, System.BinaryData>(),
                 modelWithRequiredNullable,
                 requiredBytes,
                 additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<RoundTripModel>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
+        System.BinaryData System.ClientModel.Primitives.IPersistableModel<RoundTripModel>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        protected virtual System.BinaryData PersistableModelWriteCore(System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<RoundTripModel>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<RoundTripModel>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    return ModelReaderWriter.Write(this, options);
+                    return System.ClientModel.Primitives.ModelReaderWriter.Write(this, options);
                 default:
                     throw new FormatException($"The model {nameof(RoundTripModel)} does not support writing '{options.Format}' format.");
             }
         }
 
-        RoundTripModel IPersistableModel<RoundTripModel>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
+        RoundTripModel System.ClientModel.Primitives.IPersistableModel<RoundTripModel>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
         /// <param name="data"> The data to parse. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual RoundTripModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        protected virtual RoundTripModel PersistableModelCreateCore(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<RoundTripModel>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<RoundTripModel>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    using (JsonDocument document = JsonDocument.Parse(data))
+                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(data))
                     {
-                        return DeserializeRoundTripModel(document.RootElement, options);
+                        return RoundTripModel.DeserializeRoundTripModel(document.RootElement, options);
                     }
                 default:
                     throw new FormatException($"The model {nameof(RoundTripModel)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<RoundTripModel>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string System.ClientModel.Primitives.IPersistableModel<RoundTripModel>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J";
 
-        /// <param name="roundTripModel"> The <see cref="RoundTripModel"/> to serialize into <see cref="BinaryContent"/>. </param>
+        /// <param name="roundTripModel"> The <see cref="RoundTripModel"/> to serialize into <see cref="System.ClientModel.BinaryContent"/>. </param>
         public static implicit operator BinaryContent(RoundTripModel roundTripModel)
         {
-            return BinaryContent.Create(roundTripModel, ModelSerializationExtensions.WireOptions);
+            return System.ClientModel.BinaryContent.Create(roundTripModel, ModelSerializationExtensions.WireOptions);
         }
 
-        /// <param name="result"> The <see cref="ClientResult"/> to deserialize the <see cref="RoundTripModel"/> from. </param>
-        public static explicit operator RoundTripModel(ClientResult result)
+        /// <param name="result"> The <see cref="System.ClientModel.ClientResult"/> to deserialize the <see cref="RoundTripModel"/> from. </param>
+        public static explicit operator RoundTripModel(System.ClientModel.ClientResult result)
         {
-            using PipelineResponse response = result.GetRawResponse();
-            using JsonDocument document = JsonDocument.Parse(response.Content);
-            return DeserializeRoundTripModel(document.RootElement, ModelSerializationExtensions.WireOptions);
+            using System.ClientModel.Primitives.PipelineResponse response = result.GetRawResponse();
+            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(response.Content);
+            return RoundTripModel.DeserializeRoundTripModel(document.RootElement, ModelSerializationExtensions.WireOptions);
         }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/RoundTripModel.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/RoundTripModel.cs
index 771f0b16040e9..1da69f03cc6ed 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/RoundTripModel.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/RoundTripModel.cs
@@ -13,24 +13,24 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary> this is a roundtrip model. </summary>
+    /// <summary> The RoundTripModel. </summary>
     public partial class RoundTripModel
     {
         /// <summary> Keeps track of any properties unknown to the library. </summary>
-        private protected IDictionary<string, BinaryData> _additionalBinaryDataProperties;
+        private protected IDictionary<string, System.BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="RoundTripModel"/>. </summary>
-        /// <param name="requiredString"> Required string, illustrating a reference type property. </param>
-        /// <param name="requiredInt"> Required int, illustrating a value type property. </param>
-        /// <param name="requiredCollection"> Required collection of enums. </param>
-        /// <param name="requiredDictionary"> Required dictionary of enums. </param>
-        /// <param name="requiredModel"> Required model. </param>
-        /// <param name="requiredUnknown"> required unknown. </param>
-        /// <param name="requiredRecordUnknown"> required record of unknown. </param>
-        /// <param name="modelWithRequiredNullable"> this is a model with required nullable properties. </param>
-        /// <param name="requiredBytes"> Required bytes. </param>
+        /// <param name="requiredString"></param>
+        /// <param name="requiredInt"></param>
+        /// <param name="requiredCollection"></param>
+        /// <param name="requiredDictionary"></param>
+        /// <param name="requiredModel"></param>
+        /// <param name="requiredUnknown"></param>
+        /// <param name="requiredRecordUnknown"></param>
+        /// <param name="modelWithRequiredNullable"></param>
+        /// <param name="requiredBytes"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="requiredString"/>, <paramref name="requiredCollection"/>, <paramref name="requiredDictionary"/>, <paramref name="requiredModel"/>, <paramref name="requiredUnknown"/>, <paramref name="requiredRecordUnknown"/>, <paramref name="modelWithRequiredNullable"/> or <paramref name="requiredBytes"/> is null. </exception>
-        public RoundTripModel(string requiredString, int requiredInt, IEnumerable<StringFixedEnum> requiredCollection, IDictionary<string, StringExtensibleEnum> requiredDictionary, Thing requiredModel, BinaryData requiredUnknown, IDictionary<string, BinaryData> requiredRecordUnknown, ModelWithRequiredNullableProperties modelWithRequiredNullable, BinaryData requiredBytes)
+        public RoundTripModel(string requiredString, int requiredInt, IEnumerable<StringFixedEnum> requiredCollection, IDictionary<string, StringExtensibleEnum> requiredDictionary, Thing requiredModel, System.BinaryData requiredUnknown, IDictionary<string, System.BinaryData> requiredRecordUnknown, ModelWithRequiredNullableProperties modelWithRequiredNullable, System.BinaryData requiredBytes)
         {
             Argument.AssertNotNull(requiredString, nameof(requiredString));
             Argument.AssertNotNull(requiredCollection, nameof(requiredCollection));
@@ -52,14 +52,14 @@ public RoundTripModel(string requiredString, int requiredInt, IEnumerable<String
             IntFixedEnumCollection = new ChangeTrackingList<IntFixedEnum>();
             RequiredUnknown = requiredUnknown;
             RequiredRecordUnknown = requiredRecordUnknown;
-            OptionalRecordUnknown = new ChangeTrackingDictionary<string, BinaryData>();
-            ReadOnlyRequiredRecordUnknown = new ChangeTrackingDictionary<string, BinaryData>();
-            ReadOnlyOptionalRecordUnknown = new ChangeTrackingDictionary<string, BinaryData>();
+            OptionalRecordUnknown = new ChangeTrackingDictionary<string, System.BinaryData>();
+            ReadOnlyRequiredRecordUnknown = new ChangeTrackingDictionary<string, System.BinaryData>();
+            ReadOnlyOptionalRecordUnknown = new ChangeTrackingDictionary<string, System.BinaryData>();
             ModelWithRequiredNullable = modelWithRequiredNullable;
             RequiredBytes = requiredBytes;
         }
 
-        internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixedEnum> requiredCollection, IDictionary<string, StringExtensibleEnum> requiredDictionary, Thing requiredModel, IntExtensibleEnum? intExtensibleEnum, IList<IntExtensibleEnum> intExtensibleEnumCollection, FloatExtensibleEnum? floatExtensibleEnum, FloatExtensibleEnumWithIntValue? floatExtensibleEnumWithIntValue, IList<FloatExtensibleEnum> floatExtensibleEnumCollection, FloatFixedEnum? floatFixedEnum, FloatFixedEnumWithIntValue? floatFixedEnumWithIntValue, IList<FloatFixedEnum> floatFixedEnumCollection, IntFixedEnum? intFixedEnum, IList<IntFixedEnum> intFixedEnumCollection, StringFixedEnum? stringFixedEnum, BinaryData requiredUnknown, BinaryData optionalUnknown, IDictionary<string, BinaryData> requiredRecordUnknown, IDictionary<string, BinaryData> optionalRecordUnknown, IReadOnlyDictionary<string, BinaryData> readOnlyRequiredRecordUnknown, IReadOnlyDictionary<string, BinaryData> readOnlyOptionalRecordUnknown, ModelWithRequiredNullableProperties modelWithRequiredNullable, BinaryData requiredBytes, IDictionary<string, BinaryData> additionalBinaryDataProperties)
+        internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixedEnum> requiredCollection, IDictionary<string, StringExtensibleEnum> requiredDictionary, Thing requiredModel, IntExtensibleEnum? intExtensibleEnum, IList<IntExtensibleEnum> intExtensibleEnumCollection, FloatExtensibleEnum? floatExtensibleEnum, FloatExtensibleEnumWithIntValue? floatExtensibleEnumWithIntValue, IList<FloatExtensibleEnum> floatExtensibleEnumCollection, FloatFixedEnum? floatFixedEnum, FloatFixedEnumWithIntValue? floatFixedEnumWithIntValue, IList<FloatFixedEnum> floatFixedEnumCollection, IntFixedEnum? intFixedEnum, IList<IntFixedEnum> intFixedEnumCollection, StringFixedEnum? stringFixedEnum, System.BinaryData requiredUnknown, System.BinaryData optionalUnknown, IDictionary<string, System.BinaryData> requiredRecordUnknown, IDictionary<string, System.BinaryData> optionalRecordUnknown, IReadOnlyDictionary<string, System.BinaryData> readOnlyRequiredRecordUnknown, IReadOnlyDictionary<string, System.BinaryData> readOnlyOptionalRecordUnknown, ModelWithRequiredNullableProperties modelWithRequiredNullable, System.BinaryData requiredBytes, IDictionary<string, System.BinaryData> additionalBinaryDataProperties)
         {
             RequiredString = requiredString;
             RequiredInt = requiredInt;
@@ -88,58 +88,58 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
             _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
-        /// <summary> Required string, illustrating a reference type property. </summary>
+        /// <summary> Gets or sets the RequiredString. </summary>
         public string RequiredString { get; set; }
 
-        /// <summary> Required int, illustrating a value type property. </summary>
+        /// <summary> Gets or sets the RequiredInt. </summary>
         public int RequiredInt { get; set; }
 
-        /// <summary> Required collection of enums. </summary>
+        /// <summary> Gets the RequiredCollection. </summary>
         public IList<StringFixedEnum> RequiredCollection { get; }
 
-        /// <summary> Required dictionary of enums. </summary>
+        /// <summary> Gets the RequiredDictionary. </summary>
         public IDictionary<string, StringExtensibleEnum> RequiredDictionary { get; }
 
-        /// <summary> Required model. </summary>
+        /// <summary> Gets or sets the RequiredModel. </summary>
         public Thing RequiredModel { get; set; }
 
-        /// <summary> this is an int based extensible enum. </summary>
+        /// <summary> Gets or sets the IntExtensibleEnum. </summary>
         public IntExtensibleEnum? IntExtensibleEnum { get; set; }
 
-        /// <summary> this is a collection of int based extensible enum. </summary>
+        /// <summary> Gets the IntExtensibleEnumCollection. </summary>
         public IList<IntExtensibleEnum> IntExtensibleEnumCollection { get; }
 
-        /// <summary> this is a float based extensible enum. </summary>
+        /// <summary> Gets or sets the FloatExtensibleEnum. </summary>
         public FloatExtensibleEnum? FloatExtensibleEnum { get; set; }
 
-        /// <summary> this is a float based extensible enum. </summary>
+        /// <summary> Gets or sets the FloatExtensibleEnumWithIntValue. </summary>
         public FloatExtensibleEnumWithIntValue? FloatExtensibleEnumWithIntValue { get; set; }
 
-        /// <summary> this is a collection of float based extensible enum. </summary>
+        /// <summary> Gets the FloatExtensibleEnumCollection. </summary>
         public IList<FloatExtensibleEnum> FloatExtensibleEnumCollection { get; }
 
-        /// <summary> this is a float based fixed enum. </summary>
+        /// <summary> Gets or sets the FloatFixedEnum. </summary>
         public FloatFixedEnum? FloatFixedEnum { get; set; }
 
-        /// <summary> this is a float based fixed enum. </summary>
+        /// <summary> Gets or sets the FloatFixedEnumWithIntValue. </summary>
         public FloatFixedEnumWithIntValue? FloatFixedEnumWithIntValue { get; set; }
 
-        /// <summary> this is a collection of float based fixed enum. </summary>
+        /// <summary> Gets the FloatFixedEnumCollection. </summary>
         public IList<FloatFixedEnum> FloatFixedEnumCollection { get; }
 
-        /// <summary> this is a int based fixed enum. </summary>
+        /// <summary> Gets or sets the IntFixedEnum. </summary>
         public IntFixedEnum? IntFixedEnum { get; set; }
 
-        /// <summary> this is a collection of int based fixed enum. </summary>
+        /// <summary> Gets the IntFixedEnumCollection. </summary>
         public IList<IntFixedEnum> IntFixedEnumCollection { get; }
 
-        /// <summary> this is a string based fixed enum. </summary>
+        /// <summary> Gets or sets the StringFixedEnum. </summary>
         public StringFixedEnum? StringFixedEnum { get; set; }
 
         /// <summary>
-        /// required unknown
-        /// <para> To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, JsonSerializerOptions?)"/>. </para>
-        /// <para> To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>. </para>
+        /// Gets or sets the RequiredUnknown.
+        /// <para> To assign an object to this property use <see cref="System.BinaryData.FromObjectAsJson{T}(T, Text.Json.JsonSerializerOptions?)"/>. </para>
+        /// <para> To assign an already formatted json string to this property use <see cref="System.BinaryData.FromString(string)"/>. </para>
         /// <para>
         /// Examples:
         /// <list type="bullet">
@@ -162,12 +162,12 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
         /// </list>
         /// </para>
         /// </summary>
-        public BinaryData RequiredUnknown { get; set; }
+        public System.BinaryData RequiredUnknown { get; set; }
 
         /// <summary>
-        /// optional unknown
-        /// <para> To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, JsonSerializerOptions?)"/>. </para>
-        /// <para> To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>. </para>
+        /// Gets or sets the OptionalUnknown.
+        /// <para> To assign an object to this property use <see cref="System.BinaryData.FromObjectAsJson{T}(T, Text.Json.JsonSerializerOptions?)"/>. </para>
+        /// <para> To assign an already formatted json string to this property use <see cref="System.BinaryData.FromString(string)"/>. </para>
         /// <para>
         /// Examples:
         /// <list type="bullet">
@@ -190,12 +190,12 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
         /// </list>
         /// </para>
         /// </summary>
-        public BinaryData OptionalUnknown { get; set; }
+        public System.BinaryData OptionalUnknown { get; set; }
 
         /// <summary>
-        /// required record of unknown
-        /// <para> To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, JsonSerializerOptions?)"/>. </para>
-        /// <para> To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>. </para>
+        /// Gets the RequiredRecordUnknown.
+        /// <para> To assign an object to the value of this property use <see cref="System.BinaryData.FromObjectAsJson{T}(T, Text.Json.JsonSerializerOptions?)"/>. </para>
+        /// <para> To assign an already formatted json string to this property use <see cref="System.BinaryData.FromString(string)"/>. </para>
         /// <para>
         /// Examples:
         /// <list type="bullet">
@@ -218,12 +218,12 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> RequiredRecordUnknown { get; }
+        public IDictionary<string, System.BinaryData> RequiredRecordUnknown { get; }
 
         /// <summary>
-        /// optional record of unknown
-        /// <para> To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, JsonSerializerOptions?)"/>. </para>
-        /// <para> To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>. </para>
+        /// Gets the OptionalRecordUnknown.
+        /// <para> To assign an object to the value of this property use <see cref="System.BinaryData.FromObjectAsJson{T}(T, Text.Json.JsonSerializerOptions?)"/>. </para>
+        /// <para> To assign an already formatted json string to this property use <see cref="System.BinaryData.FromString(string)"/>. </para>
         /// <para>
         /// Examples:
         /// <list type="bullet">
@@ -246,12 +246,12 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, BinaryData> OptionalRecordUnknown { get; }
+        public IDictionary<string, System.BinaryData> OptionalRecordUnknown { get; }
 
         /// <summary>
-        /// required readonly record of unknown
-        /// <para> To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, JsonSerializerOptions?)"/>. </para>
-        /// <para> To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>. </para>
+        /// Gets the ReadOnlyRequiredRecordUnknown.
+        /// <para> To assign an object to the value of this property use <see cref="System.BinaryData.FromObjectAsJson{T}(T, Text.Json.JsonSerializerOptions?)"/>. </para>
+        /// <para> To assign an already formatted json string to this property use <see cref="System.BinaryData.FromString(string)"/>. </para>
         /// <para>
         /// Examples:
         /// <list type="bullet">
@@ -274,12 +274,12 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
         /// </list>
         /// </para>
         /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> ReadOnlyRequiredRecordUnknown { get; }
+        public IReadOnlyDictionary<string, System.BinaryData> ReadOnlyRequiredRecordUnknown { get; }
 
         /// <summary>
-        /// optional readonly record of unknown
-        /// <para> To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, JsonSerializerOptions?)"/>. </para>
-        /// <para> To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>. </para>
+        /// Gets the ReadOnlyOptionalRecordUnknown.
+        /// <para> To assign an object to the value of this property use <see cref="System.BinaryData.FromObjectAsJson{T}(T, Text.Json.JsonSerializerOptions?)"/>. </para>
+        /// <para> To assign an already formatted json string to this property use <see cref="System.BinaryData.FromString(string)"/>. </para>
         /// <para>
         /// Examples:
         /// <list type="bullet">
@@ -302,15 +302,15 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
         /// </list>
         /// </para>
         /// </summary>
-        public IReadOnlyDictionary<string, BinaryData> ReadOnlyOptionalRecordUnknown { get; }
+        public IReadOnlyDictionary<string, System.BinaryData> ReadOnlyOptionalRecordUnknown { get; }
 
-        /// <summary> this is a model with required nullable properties. </summary>
+        /// <summary> Gets or sets the ModelWithRequiredNullable. </summary>
         public ModelWithRequiredNullableProperties ModelWithRequiredNullable { get; set; }
 
         /// <summary>
-        /// Required bytes
+        /// Gets or sets the RequiredBytes.
         /// <para>
-        /// To assign a byte[] to this property use <see cref="BinaryData.FromBytes(byte[])"/>.
+        /// To assign a byte[] to this property use <see cref="System.BinaryData.FromBytes(byte[])"/>.
         /// The byte[] will be serialized to a Base64 encoded string.
         /// </para>
         /// <para>
@@ -323,6 +323,6 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
         /// </list>
         /// </para>
         /// </summary>
-        public BinaryData RequiredBytes { get; set; }
+        public System.BinaryData RequiredBytes { get; set; }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/StringExtensibleEnum.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/StringExtensibleEnum.cs
index a2c32dfebf119..763a97b0ca187 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/StringExtensibleEnum.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/StringExtensibleEnum.cs
@@ -11,7 +11,7 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary> Extensible enum. </summary>
+    /// <summary></summary>
     public readonly partial struct StringExtensibleEnum : IEquatable<StringExtensibleEnum>
     {
         private readonly string _value;
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/StringFixedEnum.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/StringFixedEnum.cs
index 8144ab9aa5b5b..bdd58124021cb 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/StringFixedEnum.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/StringFixedEnum.cs
@@ -7,7 +7,7 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary> Simple enum. </summary>
+    /// <summary></summary>
     public enum StringFixedEnum
     {
         /// <summary> One. </summary>
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Thing.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Thing.Serialization.cs
index f12038ab30d4c..3c2ad85f63885 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Thing.Serialization.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Thing.Serialization.cs
@@ -15,13 +15,13 @@
 namespace BasicTypeSpec.Models
 {
     /// <summary></summary>
-    public partial class Thing : IJsonModel<Thing>
+    public partial class Thing : System.ClientModel.Primitives.IJsonModel<Thing>
     {
         internal Thing()
         {
         }
 
-        void IJsonModel<Thing>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        void System.ClientModel.Primitives.IJsonModel<Thing>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -30,9 +30,9 @@ void IJsonModel<Thing>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions opt
 
         /// <param name="writer"> The JSON writer. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
+        protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<Thing>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<Thing>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(Thing)} does not support writing '{format}' format.");
@@ -43,9 +43,9 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
 #if NET6_0_OR_GREATER
             writer.WriteRawValue(RequiredUnion);
 #else
-            using (JsonDocument document = JsonDocument.Parse(RequiredUnion))
+            using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(RequiredUnion))
             {
-                JsonSerializer.Serialize(writer, document.RootElement);
+                System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
             }
 #endif
             writer.WritePropertyName("requiredLiteralString"u8);
@@ -84,7 +84,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
                 {
                     writer.WritePropertyName("optionalNullableList"u8);
                     writer.WriteStartArray();
-                    foreach (var item in OptionalNullableList)
+                    foreach (int item in OptionalNullableList)
                     {
                         writer.WriteNumberValue(item);
                     }
@@ -99,7 +99,7 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
             {
                 writer.WritePropertyName("requiredNullableList"u8);
                 writer.WriteStartArray();
-                foreach (var item in RequiredNullableList)
+                foreach (int item in RequiredNullableList)
                 {
                     writer.WriteNumberValue(item);
                 }
@@ -117,38 +117,38 @@ protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWrit
 #if NET6_0_OR_GREATER
                     writer.WriteRawValue(item.Value);
 #else
-                    using (JsonDocument document = JsonDocument.Parse(item.Value))
+                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(item.Value))
                     {
-                        JsonSerializer.Serialize(writer, document.RootElement);
+                        System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
                     }
 #endif
                 }
             }
         }
 
-        Thing IJsonModel<Thing>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+        Thing System.ClientModel.Primitives.IJsonModel<Thing>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
 
         /// <param name="reader"> The JSON reader. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual Thing JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
+        protected virtual Thing JsonModelCreateCore(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<Thing>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<Thing>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(Thing)} does not support reading '{format}' format.");
             }
-            using JsonDocument document = JsonDocument.ParseValue(ref reader);
-            return DeserializeThing(document.RootElement, options);
+            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.ParseValue(ref reader);
+            return Thing.DeserializeThing(document.RootElement, options);
         }
 
-        internal static Thing DeserializeThing(JsonElement element, ModelReaderWriterOptions options)
+        internal static Thing DeserializeThing(System.Text.Json.JsonElement element, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            if (element.ValueKind == JsonValueKind.Null)
+            if (element.ValueKind == System.Text.Json.JsonValueKind.Null)
             {
                 return null;
             }
             string name = default;
-            BinaryData requiredUnion = default;
+            System.BinaryData requiredUnion = default;
             ThingRequiredLiteralString requiredLiteralString = default;
             ThingRequiredLiteralInt requiredLiteralInt = default;
             ThingRequiredLiteralFloat requiredLiteralFloat = default;
@@ -160,7 +160,7 @@ internal static Thing DeserializeThing(JsonElement element, ModelReaderWriterOpt
             string requiredBadDescription = default;
             IList<int> optionalNullableList = default;
             IList<int> requiredNullableList = default;
-            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
+            IDictionary<string, System.BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, System.BinaryData>();
             foreach (var prop in element.EnumerateObject())
             {
                 if (prop.NameEquals("name"u8))
@@ -170,7 +170,7 @@ internal static Thing DeserializeThing(JsonElement element, ModelReaderWriterOpt
                 }
                 if (prop.NameEquals("requiredUnion"u8))
                 {
-                    requiredUnion = BinaryData.FromString(prop.Value.GetRawText());
+                    requiredUnion = System.BinaryData.FromString(prop.Value.GetRawText());
                     continue;
                 }
                 if (prop.NameEquals("requiredLiteralString"u8))
@@ -195,7 +195,7 @@ internal static Thing DeserializeThing(JsonElement element, ModelReaderWriterOpt
                 }
                 if (prop.NameEquals("optionalLiteralString"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         optionalLiteralString = null;
                         continue;
@@ -205,7 +205,7 @@ internal static Thing DeserializeThing(JsonElement element, ModelReaderWriterOpt
                 }
                 if (prop.NameEquals("optionalLiteralInt"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         optionalLiteralInt = null;
                         continue;
@@ -215,7 +215,7 @@ internal static Thing DeserializeThing(JsonElement element, ModelReaderWriterOpt
                 }
                 if (prop.NameEquals("optionalLiteralFloat"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         optionalLiteralFloat = null;
                         continue;
@@ -225,7 +225,7 @@ internal static Thing DeserializeThing(JsonElement element, ModelReaderWriterOpt
                 }
                 if (prop.NameEquals("optionalLiteralBool"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         optionalLiteralBool = null;
                         continue;
@@ -240,7 +240,7 @@ internal static Thing DeserializeThing(JsonElement element, ModelReaderWriterOpt
                 }
                 if (prop.NameEquals("optionalNullableList"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         continue;
                     }
@@ -254,7 +254,7 @@ internal static Thing DeserializeThing(JsonElement element, ModelReaderWriterOpt
                 }
                 if (prop.NameEquals("requiredNullableList"u8))
                 {
-                    if (prop.Value.ValueKind == JsonValueKind.Null)
+                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
                     {
                         requiredNullableList = new ChangeTrackingList<int>();
                         continue;
@@ -269,7 +269,7 @@ internal static Thing DeserializeThing(JsonElement element, ModelReaderWriterOpt
                 }
                 if (options.Format != "W")
                 {
-                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, System.BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
             return new Thing(
@@ -289,54 +289,54 @@ internal static Thing DeserializeThing(JsonElement element, ModelReaderWriterOpt
                 additionalBinaryDataProperties);
         }
 
-        BinaryData IPersistableModel<Thing>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
+        System.BinaryData System.ClientModel.Primitives.IPersistableModel<Thing>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
+        protected virtual System.BinaryData PersistableModelWriteCore(System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<Thing>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<Thing>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    return ModelReaderWriter.Write(this, options);
+                    return System.ClientModel.Primitives.ModelReaderWriter.Write(this, options);
                 default:
                     throw new FormatException($"The model {nameof(Thing)} does not support writing '{options.Format}' format.");
             }
         }
 
-        Thing IPersistableModel<Thing>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
+        Thing System.ClientModel.Primitives.IPersistableModel<Thing>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
         /// <param name="data"> The data to parse. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual Thing PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
+        protected virtual Thing PersistableModelCreateCore(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((IPersistableModel<Thing>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<Thing>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    using (JsonDocument document = JsonDocument.Parse(data))
+                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(data))
                     {
-                        return DeserializeThing(document.RootElement, options);
+                        return Thing.DeserializeThing(document.RootElement, options);
                     }
                 default:
                     throw new FormatException($"The model {nameof(Thing)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string IPersistableModel<Thing>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
+        string System.ClientModel.Primitives.IPersistableModel<Thing>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J";
 
-        /// <param name="thing"> The <see cref="Thing"/> to serialize into <see cref="BinaryContent"/>. </param>
+        /// <param name="thing"> The <see cref="Thing"/> to serialize into <see cref="System.ClientModel.BinaryContent"/>. </param>
         public static implicit operator BinaryContent(Thing thing)
         {
-            return BinaryContent.Create(thing, ModelSerializationExtensions.WireOptions);
+            return System.ClientModel.BinaryContent.Create(thing, ModelSerializationExtensions.WireOptions);
         }
 
-        /// <param name="result"> The <see cref="ClientResult"/> to deserialize the <see cref="Thing"/> from. </param>
-        public static explicit operator Thing(ClientResult result)
+        /// <param name="result"> The <see cref="System.ClientModel.ClientResult"/> to deserialize the <see cref="Thing"/> from. </param>
+        public static explicit operator Thing(System.ClientModel.ClientResult result)
         {
-            using PipelineResponse response = result.GetRawResponse();
-            using JsonDocument document = JsonDocument.Parse(response.Content);
-            return DeserializeThing(document.RootElement, ModelSerializationExtensions.WireOptions);
+            using System.ClientModel.Primitives.PipelineResponse response = result.GetRawResponse();
+            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(response.Content);
+            return Thing.DeserializeThing(document.RootElement, ModelSerializationExtensions.WireOptions);
         }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Thing.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Thing.cs
index c35fd826366ef..0af7873afdaa7 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Thing.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Thing.cs
@@ -13,19 +13,19 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary> A model with a few properties of literal types. </summary>
+    /// <summary> The Thing. </summary>
     public partial class Thing
     {
         /// <summary> Keeps track of any properties unknown to the library. </summary>
-        private protected IDictionary<string, BinaryData> _additionalBinaryDataProperties;
+        private protected IDictionary<string, System.BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="Thing"/>. </summary>
-        /// <param name="name"> name of the Thing. </param>
-        /// <param name="requiredUnion"> required Union. </param>
-        /// <param name="requiredBadDescription"> description with xml &lt;|endoftext|&gt;. </param>
-        /// <param name="requiredNullableList"> required nullable collection. </param>
+        /// <param name="name"></param>
+        /// <param name="requiredUnion"></param>
+        /// <param name="requiredBadDescription"></param>
+        /// <param name="requiredNullableList"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/>, <paramref name="requiredUnion"/> or <paramref name="requiredBadDescription"/> is null. </exception>
-        public Thing(string name, BinaryData requiredUnion, string requiredBadDescription, IEnumerable<int> requiredNullableList)
+        public Thing(string name, System.BinaryData requiredUnion, string requiredBadDescription, IEnumerable<int> requiredNullableList)
         {
             Argument.AssertNotNull(name, nameof(name));
             Argument.AssertNotNull(requiredUnion, nameof(requiredUnion));
@@ -38,7 +38,7 @@ public Thing(string name, BinaryData requiredUnion, string requiredBadDescriptio
             RequiredNullableList = requiredNullableList?.ToList();
         }
 
-        internal Thing(string name, BinaryData requiredUnion, ThingRequiredLiteralString requiredLiteralString, ThingRequiredLiteralInt requiredLiteralInt, ThingRequiredLiteralFloat requiredLiteralFloat, bool requiredLiteralBool, ThingOptionalLiteralString? optionalLiteralString, ThingOptionalLiteralInt? optionalLiteralInt, ThingOptionalLiteralFloat? optionalLiteralFloat, bool? optionalLiteralBool, string requiredBadDescription, IList<int> optionalNullableList, IList<int> requiredNullableList, IDictionary<string, BinaryData> additionalBinaryDataProperties)
+        internal Thing(string name, System.BinaryData requiredUnion, ThingRequiredLiteralString requiredLiteralString, ThingRequiredLiteralInt requiredLiteralInt, ThingRequiredLiteralFloat requiredLiteralFloat, bool requiredLiteralBool, ThingOptionalLiteralString? optionalLiteralString, ThingOptionalLiteralInt? optionalLiteralInt, ThingOptionalLiteralFloat? optionalLiteralFloat, bool? optionalLiteralBool, string requiredBadDescription, IList<int> optionalNullableList, IList<int> requiredNullableList, IDictionary<string, System.BinaryData> additionalBinaryDataProperties)
         {
             Name = name;
             RequiredUnion = requiredUnion;
@@ -56,13 +56,13 @@ internal Thing(string name, BinaryData requiredUnion, ThingRequiredLiteralString
             _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
-        /// <summary> name of the Thing. </summary>
+        /// <summary> Gets or sets the Name. </summary>
         public string Name { get; set; }
 
         /// <summary>
-        /// required Union
-        /// <para> To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, JsonSerializerOptions?)"/>. </para>
-        /// <para> To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>. </para>
+        /// Gets or sets the RequiredUnion.
+        /// <para> To assign an object to this property use <see cref="System.BinaryData.FromObjectAsJson{T}(T, Text.Json.JsonSerializerOptions?)"/>. </para>
+        /// <para> To assign an already formatted json string to this property use <see cref="System.BinaryData.FromString(string)"/>. </para>
         /// <para>
         /// <remarks>
         /// Supported types:
@@ -101,39 +101,39 @@ internal Thing(string name, BinaryData requiredUnion, ThingRequiredLiteralString
         /// </list>
         /// </para>
         /// </summary>
-        public BinaryData RequiredUnion { get; set; }
+        public System.BinaryData RequiredUnion { get; set; }
 
-        /// <summary> required literal string. </summary>
+        /// <summary> Gets the RequiredLiteralString. </summary>
         public ThingRequiredLiteralString RequiredLiteralString { get; } = "accept";
 
-        /// <summary> required literal int. </summary>
+        /// <summary> Gets the RequiredLiteralInt. </summary>
         public ThingRequiredLiteralInt RequiredLiteralInt { get; } = 123;
 
-        /// <summary> required literal float. </summary>
+        /// <summary> Gets the RequiredLiteralFloat. </summary>
         public ThingRequiredLiteralFloat RequiredLiteralFloat { get; } = 1.23F;
 
-        /// <summary> required literal bool. </summary>
+        /// <summary> Gets the RequiredLiteralBool. </summary>
         public bool RequiredLiteralBool { get; } = false;
 
-        /// <summary> optional literal string. </summary>
+        /// <summary> Gets or sets the OptionalLiteralString. </summary>
         public ThingOptionalLiteralString? OptionalLiteralString { get; set; }
 
-        /// <summary> optional literal int. </summary>
+        /// <summary> Gets or sets the OptionalLiteralInt. </summary>
         public ThingOptionalLiteralInt? OptionalLiteralInt { get; set; }
 
-        /// <summary> optional literal float. </summary>
+        /// <summary> Gets or sets the OptionalLiteralFloat. </summary>
         public ThingOptionalLiteralFloat? OptionalLiteralFloat { get; set; }
 
-        /// <summary> optional literal bool. </summary>
+        /// <summary> Gets or sets the OptionalLiteralBool. </summary>
         public bool? OptionalLiteralBool { get; set; }
 
-        /// <summary> description with xml &lt;|endoftext|&gt;. </summary>
+        /// <summary> Gets or sets the RequiredBadDescription. </summary>
         public string RequiredBadDescription { get; set; }
 
-        /// <summary> optional nullable collection. </summary>
+        /// <summary> Gets or sets the OptionalNullableList. </summary>
         public IList<int> OptionalNullableList { get; set; }
 
-        /// <summary> required nullable collection. </summary>
+        /// <summary> Gets or sets the RequiredNullableList. </summary>
         public IList<int> RequiredNullableList { get; set; }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/tspCodeModel.json
index 78b8291163024..f38a2f3ce37be 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/tspCodeModel.json
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/tspCodeModel.json
@@ -269,7 +269,6 @@
      "decorators": []
     }
    ],
-   "description": "Simple enum",
    "isFixed": true,
    "isFlags": false,
    "usage": "Input,Output,Json",
@@ -340,7 +339,6 @@
      "decorators": []
     }
    ],
-   "description": "Extensible enum",
    "isFixed": false,
    "isFlags": false,
    "usage": "Input,Output,Json",
@@ -411,7 +409,6 @@
      "decorators": []
     }
    ],
-   "description": "Int based extensible enum",
    "isFixed": false,
    "isFlags": false,
    "usage": "Input,Output,Json",
@@ -482,7 +479,6 @@
      "decorators": []
     }
    ],
-   "description": "Float based extensible enum",
    "isFixed": false,
    "isFlags": false,
    "usage": "Input,Output,Json",
@@ -553,7 +549,6 @@
      "decorators": []
     }
    ],
-   "description": "float fixed enum",
    "isFixed": false,
    "isFlags": false,
    "usage": "Input,Output,Json",
@@ -624,7 +619,6 @@
      "decorators": []
     }
    ],
-   "description": "float fixed enum",
    "isFixed": true,
    "isFlags": false,
    "usage": "Input,Output,Json",
@@ -695,7 +689,6 @@
      "decorators": []
     }
    ],
-   "description": "float fixed enum",
    "isFixed": true,
    "isFlags": false,
    "usage": "Input,Output,Json",
@@ -766,7 +759,6 @@
      "decorators": []
     }
    ],
-   "description": "int fixed enum",
    "isFixed": true,
    "isFlags": false,
    "usage": "Input,Output,Json",
@@ -775,208 +767,10 @@
   {
    "$id": "84",
    "kind": "enum",
-   "name": "AnonymousBodyRequest_requiredLiteralString",
-   "valueType": {
-    "$id": "85",
-    "kind": "string",
-    "name": "string",
-    "crossLanguageDefinitionId": "TypeSpec.string",
-    "decorators": []
-   },
-   "values": [
-    {
-     "$id": "86",
-     "kind": "enumvalue",
-     "name": "accept",
-     "value": "accept",
-     "description": "accept",
-     "valueType": {
-      "$ref": "85"
-     },
-     "enumType": {
-      "$ref": "84"
-     }
-    }
-   ],
-   "crossLanguageDefinitionId": "",
-   "description": "The AnonymousBodyRequest_requiredLiteralString",
-   "isFixed": false,
-   "isFlags": false,
-   "usage": "Spread,Json",
-   "decorators": []
-  },
-  {
-   "$id": "87",
-   "kind": "enum",
-   "name": "AnonymousBodyRequest_requiredLiteralInt",
-   "valueType": {
-    "$id": "88",
-    "kind": "int32",
-    "name": "int32",
-    "crossLanguageDefinitionId": "TypeSpec.int32",
-    "decorators": []
-   },
-   "values": [
-    {
-     "$id": "89",
-     "kind": "enumvalue",
-     "name": "123",
-     "value": 123,
-     "description": "123",
-     "valueType": {
-      "$ref": "88"
-     },
-     "enumType": {
-      "$ref": "87"
-     }
-    }
-   ],
-   "crossLanguageDefinitionId": "",
-   "description": "The AnonymousBodyRequest_requiredLiteralInt",
-   "isFixed": false,
-   "isFlags": false,
-   "usage": "Spread,Json",
-   "decorators": []
-  },
-  {
-   "$id": "90",
-   "kind": "enum",
-   "name": "AnonymousBodyRequest_requiredLiteralFloat",
-   "valueType": {
-    "$id": "91",
-    "kind": "float32",
-    "name": "float32",
-    "crossLanguageDefinitionId": "TypeSpec.float32",
-    "decorators": []
-   },
-   "values": [
-    {
-     "$id": "92",
-     "kind": "enumvalue",
-     "name": "1.23",
-     "value": 1.23,
-     "description": "1.23",
-     "valueType": {
-      "$ref": "91"
-     },
-     "enumType": {
-      "$ref": "90"
-     }
-    }
-   ],
-   "crossLanguageDefinitionId": "",
-   "description": "The AnonymousBodyRequest_requiredLiteralFloat",
-   "isFixed": false,
-   "isFlags": false,
-   "usage": "Spread,Json",
-   "decorators": []
-  },
-  {
-   "$id": "93",
-   "kind": "enum",
-   "name": "AnonymousBodyRequest_optionalLiteralString",
-   "valueType": {
-    "$id": "94",
-    "kind": "string",
-    "name": "string",
-    "crossLanguageDefinitionId": "TypeSpec.string",
-    "decorators": []
-   },
-   "values": [
-    {
-     "$id": "95",
-     "kind": "enumvalue",
-     "name": "reject",
-     "value": "reject",
-     "description": "reject",
-     "valueType": {
-      "$ref": "94"
-     },
-     "enumType": {
-      "$ref": "93"
-     }
-    }
-   ],
-   "crossLanguageDefinitionId": "",
-   "description": "The AnonymousBodyRequest_optionalLiteralString",
-   "isFixed": false,
-   "isFlags": false,
-   "usage": "Spread,Json",
-   "decorators": []
-  },
-  {
-   "$id": "96",
-   "kind": "enum",
-   "name": "AnonymousBodyRequest_optionalLiteralInt",
-   "valueType": {
-    "$id": "97",
-    "kind": "int32",
-    "name": "int32",
-    "crossLanguageDefinitionId": "TypeSpec.int32",
-    "decorators": []
-   },
-   "values": [
-    {
-     "$id": "98",
-     "kind": "enumvalue",
-     "name": "456",
-     "value": 456,
-     "description": "456",
-     "valueType": {
-      "$ref": "97"
-     },
-     "enumType": {
-      "$ref": "96"
-     }
-    }
-   ],
-   "crossLanguageDefinitionId": "",
-   "description": "The AnonymousBodyRequest_optionalLiteralInt",
-   "isFixed": false,
-   "isFlags": false,
-   "usage": "Spread,Json",
-   "decorators": []
-  },
-  {
-   "$id": "99",
-   "kind": "enum",
-   "name": "AnonymousBodyRequest_optionalLiteralFloat",
-   "valueType": {
-    "$id": "100",
-    "kind": "float32",
-    "name": "float32",
-    "crossLanguageDefinitionId": "TypeSpec.float32",
-    "decorators": []
-   },
-   "values": [
-    {
-     "$id": "101",
-     "kind": "enumvalue",
-     "name": "4.56",
-     "value": 4.56,
-     "description": "4.56",
-     "valueType": {
-      "$ref": "100"
-     },
-     "enumType": {
-      "$ref": "99"
-     }
-    }
-   ],
-   "crossLanguageDefinitionId": "",
-   "description": "The AnonymousBodyRequest_optionalLiteralFloat",
-   "isFixed": false,
-   "isFlags": false,
-   "usage": "Spread,Json",
-   "decorators": []
-  },
-  {
-   "$id": "102",
-   "kind": "enum",
    "name": "Versions",
    "crossLanguageDefinitionId": "BasicTypeSpec.Versions",
    "valueType": {
-    "$id": "103",
+    "$id": "85",
     "kind": "string",
     "name": "string",
     "crossLanguageDefinitionId": "TypeSpec.string",
@@ -984,36 +778,36 @@
    },
    "values": [
     {
-     "$id": "104",
+     "$id": "86",
      "kind": "enumvalue",
      "name": "2024-07-16-preview",
      "value": "2024-07-16-preview",
      "valueType": {
-      "$id": "105",
+      "$id": "87",
       "kind": "string",
       "name": "string",
       "crossLanguageDefinitionId": "TypeSpec.string",
       "decorators": []
      },
      "enumType": {
-      "$ref": "102"
+      "$ref": "84"
      },
      "decorators": []
     },
     {
-     "$id": "106",
+     "$id": "88",
      "kind": "enumvalue",
      "name": "2024-08-16-preview",
      "value": "2024-08-16-preview",
      "valueType": {
-      "$id": "107",
+      "$id": "89",
       "kind": "string",
       "name": "string",
       "crossLanguageDefinitionId": "TypeSpec.string",
       "decorators": []
      },
      "enumType": {
-      "$ref": "102"
+      "$ref": "84"
      },
      "decorators": []
     }
@@ -1026,22 +820,20 @@
  ],
  "Models": [
   {
-   "$id": "108",
+   "$id": "90",
    "kind": "model",
    "name": "Thing",
    "crossLanguageDefinitionId": "BasicTypeSpec.Thing",
    "usage": "Input,Output,Json",
-   "description": "A model with a few properties of literal types",
    "decorators": [],
    "properties": [
     {
-     "$id": "109",
+     "$id": "91",
      "kind": "property",
      "name": "name",
      "serializedName": "name",
-     "description": "name of the Thing",
      "type": {
-      "$id": "110",
+      "$id": "92",
       "kind": "string",
       "name": "string",
       "crossLanguageDefinitionId": "TypeSpec.string",
@@ -1050,33 +842,33 @@
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.Thing.name"
     },
     {
-     "$id": "111",
+     "$id": "93",
      "kind": "property",
      "name": "requiredUnion",
      "serializedName": "requiredUnion",
-     "description": "required Union",
      "type": {
-      "$id": "112",
+      "$id": "94",
       "kind": "union",
       "name": "ThingRequiredUnion",
       "variantTypes": [
        {
-        "$id": "113",
+        "$id": "95",
         "kind": "string",
         "name": "string",
         "crossLanguageDefinitionId": "TypeSpec.string",
         "decorators": []
        },
        {
-        "$id": "114",
+        "$id": "96",
         "kind": "array",
         "name": "Array",
         "valueType": {
-         "$id": "115",
+         "$id": "97",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -1086,7 +878,7 @@
         "decorators": []
        },
        {
-        "$id": "116",
+        "$id": "98",
         "kind": "int32",
         "name": "int32",
         "crossLanguageDefinitionId": "TypeSpec.int32",
@@ -1098,17 +890,17 @@
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.Thing.requiredUnion"
     },
     {
-     "$id": "117",
+     "$id": "99",
      "kind": "property",
      "name": "requiredLiteralString",
      "serializedName": "requiredLiteralString",
-     "description": "required literal string",
      "type": {
-      "$id": "118",
+      "$id": "100",
       "kind": "constant",
       "valueType": {
        "$ref": "2"
@@ -1119,17 +911,17 @@
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.Thing.requiredLiteralString"
     },
     {
-     "$id": "119",
+     "$id": "101",
      "kind": "property",
      "name": "requiredLiteralInt",
      "serializedName": "requiredLiteralInt",
-     "description": "required literal int",
      "type": {
-      "$id": "120",
+      "$id": "102",
       "kind": "constant",
       "valueType": {
        "$ref": "5"
@@ -1140,17 +932,17 @@
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.Thing.requiredLiteralInt"
     },
     {
-     "$id": "121",
+     "$id": "103",
      "kind": "property",
      "name": "requiredLiteralFloat",
      "serializedName": "requiredLiteralFloat",
-     "description": "required literal float",
      "type": {
-      "$id": "122",
+      "$id": "104",
       "kind": "constant",
       "valueType": {
        "$ref": "8"
@@ -1161,20 +953,20 @@
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.Thing.requiredLiteralFloat"
     },
     {
-     "$id": "123",
+     "$id": "105",
      "kind": "property",
      "name": "requiredLiteralBool",
      "serializedName": "requiredLiteralBool",
-     "description": "required literal bool",
      "type": {
-      "$id": "124",
+      "$id": "106",
       "kind": "constant",
       "valueType": {
-       "$id": "125",
+       "$id": "107",
        "kind": "boolean",
        "name": "boolean",
        "crossLanguageDefinitionId": "TypeSpec.boolean",
@@ -1186,17 +978,17 @@
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.Thing.requiredLiteralBool"
     },
     {
-     "$id": "126",
+     "$id": "108",
      "kind": "property",
      "name": "optionalLiteralString",
      "serializedName": "optionalLiteralString",
-     "description": "optional literal string",
      "type": {
-      "$id": "127",
+      "$id": "109",
       "kind": "constant",
       "valueType": {
        "$ref": "11"
@@ -1207,17 +999,17 @@
      "optional": true,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.Thing.optionalLiteralString"
     },
     {
-     "$id": "128",
+     "$id": "110",
      "kind": "property",
      "name": "optionalLiteralInt",
      "serializedName": "optionalLiteralInt",
-     "description": "optional literal int",
      "type": {
-      "$id": "129",
+      "$id": "111",
       "kind": "constant",
       "valueType": {
        "$ref": "14"
@@ -1228,17 +1020,17 @@
      "optional": true,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.Thing.optionalLiteralInt"
     },
     {
-     "$id": "130",
+     "$id": "112",
      "kind": "property",
      "name": "optionalLiteralFloat",
      "serializedName": "optionalLiteralFloat",
-     "description": "optional literal float",
      "type": {
-      "$id": "131",
+      "$id": "113",
       "kind": "constant",
       "valueType": {
        "$ref": "17"
@@ -1249,20 +1041,20 @@
      "optional": true,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.Thing.optionalLiteralFloat"
     },
     {
-     "$id": "132",
+     "$id": "114",
      "kind": "property",
      "name": "optionalLiteralBool",
      "serializedName": "optionalLiteralBool",
-     "description": "optional literal bool",
      "type": {
-      "$id": "133",
+      "$id": "115",
       "kind": "constant",
       "valueType": {
-       "$id": "134",
+       "$id": "116",
        "kind": "boolean",
        "name": "boolean",
        "crossLanguageDefinitionId": "TypeSpec.boolean",
@@ -1274,17 +1066,17 @@
      "optional": true,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.Thing.optionalLiteralBool"
     },
     {
-     "$id": "135",
+     "$id": "117",
      "kind": "property",
      "name": "requiredBadDescription",
      "serializedName": "requiredBadDescription",
-     "description": "description with xml <|endoftext|>",
      "type": {
-      "$id": "136",
+      "$id": "118",
       "kind": "string",
       "name": "string",
       "crossLanguageDefinitionId": "TypeSpec.string",
@@ -1293,24 +1085,24 @@
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.Thing.requiredBadDescription"
     },
     {
-     "$id": "137",
+     "$id": "119",
      "kind": "property",
      "name": "optionalNullableList",
      "serializedName": "optionalNullableList",
-     "description": "optional nullable collection",
      "type": {
-      "$id": "138",
+      "$id": "120",
       "kind": "nullable",
       "type": {
-       "$id": "139",
+       "$id": "121",
        "kind": "array",
        "name": "Array",
        "valueType": {
-        "$id": "140",
+        "$id": "122",
         "kind": "int32",
         "name": "int32",
         "crossLanguageDefinitionId": "TypeSpec.int32",
@@ -1323,24 +1115,24 @@
      "optional": true,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.Thing.optionalNullableList"
     },
     {
-     "$id": "141",
+     "$id": "123",
      "kind": "property",
      "name": "requiredNullableList",
      "serializedName": "requiredNullableList",
-     "description": "required nullable collection",
      "type": {
-      "$id": "142",
+      "$id": "124",
       "kind": "nullable",
       "type": {
-       "$id": "143",
+       "$id": "125",
        "kind": "array",
        "name": "Array",
        "valueType": {
-        "$id": "144",
+        "$id": "126",
         "kind": "int32",
         "name": "int32",
         "crossLanguageDefinitionId": "TypeSpec.int32",
@@ -1353,28 +1145,27 @@
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.Thing.requiredNullableList"
     }
    ]
   },
   {
-   "$id": "145",
+   "$id": "127",
    "kind": "model",
    "name": "RoundTripModel",
    "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel",
    "usage": "Input,Output,Json",
-   "description": "this is a roundtrip model",
    "decorators": [],
    "properties": [
     {
-     "$id": "146",
+     "$id": "128",
      "kind": "property",
      "name": "requiredString",
      "serializedName": "requiredString",
-     "description": "Required string, illustrating a reference type property.",
      "type": {
-      "$id": "147",
+      "$id": "129",
       "kind": "string",
       "name": "string",
       "crossLanguageDefinitionId": "TypeSpec.string",
@@ -1383,17 +1174,17 @@
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.requiredString"
     },
     {
-     "$id": "148",
+     "$id": "130",
      "kind": "property",
      "name": "requiredInt",
      "serializedName": "requiredInt",
-     "description": "Required int, illustrating a value type property.",
      "type": {
-      "$id": "149",
+      "$id": "131",
       "kind": "int32",
       "name": "int32",
       "crossLanguageDefinitionId": "TypeSpec.int32",
@@ -1402,17 +1193,17 @@
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.requiredInt"
     },
     {
-     "$id": "150",
+     "$id": "132",
      "kind": "property",
      "name": "requiredCollection",
      "serializedName": "requiredCollection",
-     "description": "Required collection of enums",
      "type": {
-      "$id": "151",
+      "$id": "133",
       "kind": "array",
       "name": "ArrayStringFixedEnum",
       "valueType": {
@@ -1424,20 +1215,20 @@
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.requiredCollection"
     },
     {
-     "$id": "152",
+     "$id": "134",
      "kind": "property",
      "name": "requiredDictionary",
      "serializedName": "requiredDictionary",
-     "description": "Required dictionary of enums",
      "type": {
-      "$id": "153",
+      "$id": "135",
       "kind": "dict",
       "keyType": {
-       "$id": "154",
+       "$id": "136",
        "kind": "string",
        "name": "string",
        "crossLanguageDefinitionId": "TypeSpec.string",
@@ -1451,47 +1242,47 @@
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.requiredDictionary"
     },
     {
-     "$id": "155",
+     "$id": "137",
      "kind": "property",
      "name": "requiredModel",
      "serializedName": "requiredModel",
-     "description": "Required model",
      "type": {
-      "$ref": "108"
+      "$ref": "90"
      },
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.requiredModel"
     },
     {
-     "$id": "156",
+     "$id": "138",
      "kind": "property",
      "name": "intExtensibleEnum",
      "serializedName": "intExtensibleEnum",
-     "description": "this is an int based extensible enum",
      "type": {
       "$ref": "36"
      },
      "optional": true,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.intExtensibleEnum"
     },
     {
-     "$id": "157",
+     "$id": "139",
      "kind": "property",
      "name": "intExtensibleEnumCollection",
      "serializedName": "intExtensibleEnumCollection",
-     "description": "this is a collection of int based extensible enum",
      "type": {
-      "$id": "158",
+      "$id": "140",
       "kind": "array",
       "name": "ArrayIntExtensibleEnum",
       "valueType": {
@@ -1503,47 +1294,47 @@
      "optional": true,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.intExtensibleEnumCollection"
     },
     {
-     "$id": "159",
+     "$id": "141",
      "kind": "property",
      "name": "floatExtensibleEnum",
      "serializedName": "floatExtensibleEnum",
-     "description": "this is a float based extensible enum",
      "type": {
       "$ref": "44"
      },
      "optional": true,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.floatExtensibleEnum"
     },
     {
-     "$id": "160",
+     "$id": "142",
      "kind": "property",
      "name": "floatExtensibleEnumWithIntValue",
      "serializedName": "floatExtensibleEnumWithIntValue",
-     "description": "this is a float based extensible enum",
      "type": {
       "$ref": "52"
      },
      "optional": true,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.floatExtensibleEnumWithIntValue"
     },
     {
-     "$id": "161",
+     "$id": "143",
      "kind": "property",
      "name": "floatExtensibleEnumCollection",
      "serializedName": "floatExtensibleEnumCollection",
-     "description": "this is a collection of float based extensible enum",
      "type": {
-      "$id": "162",
+      "$id": "144",
       "kind": "array",
       "name": "ArrayFloatExtensibleEnum",
       "valueType": {
@@ -1555,47 +1346,47 @@
      "optional": true,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.floatExtensibleEnumCollection"
     },
     {
-     "$id": "163",
+     "$id": "145",
      "kind": "property",
      "name": "floatFixedEnum",
      "serializedName": "floatFixedEnum",
-     "description": "this is a float based fixed enum",
      "type": {
       "$ref": "60"
      },
      "optional": true,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.floatFixedEnum"
     },
     {
-     "$id": "164",
+     "$id": "146",
      "kind": "property",
      "name": "floatFixedEnumWithIntValue",
      "serializedName": "floatFixedEnumWithIntValue",
-     "description": "this is a float based fixed enum",
      "type": {
       "$ref": "68"
      },
      "optional": true,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.floatFixedEnumWithIntValue"
     },
     {
-     "$id": "165",
+     "$id": "147",
      "kind": "property",
      "name": "floatFixedEnumCollection",
      "serializedName": "floatFixedEnumCollection",
-     "description": "this is a collection of float based fixed enum",
      "type": {
-      "$id": "166",
+      "$id": "148",
       "kind": "array",
       "name": "ArrayFloatFixedEnum",
       "valueType": {
@@ -1607,32 +1398,32 @@
      "optional": true,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.floatFixedEnumCollection"
     },
     {
-     "$id": "167",
+     "$id": "149",
      "kind": "property",
      "name": "intFixedEnum",
      "serializedName": "intFixedEnum",
-     "description": "this is a int based fixed enum",
      "type": {
       "$ref": "76"
      },
      "optional": true,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.intFixedEnum"
     },
     {
-     "$id": "168",
+     "$id": "150",
      "kind": "property",
      "name": "intFixedEnumCollection",
      "serializedName": "intFixedEnumCollection",
-     "description": "this is a collection of int based fixed enum",
      "type": {
-      "$id": "169",
+      "$id": "151",
       "kind": "array",
       "name": "ArrayIntFixedEnum",
       "valueType": {
@@ -1644,33 +1435,33 @@
      "optional": true,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.intFixedEnumCollection"
     },
     {
-     "$id": "170",
+     "$id": "152",
      "kind": "property",
      "name": "stringFixedEnum",
      "serializedName": "stringFixedEnum",
-     "description": "this is a string based fixed enum",
      "type": {
       "$ref": "20"
      },
      "optional": true,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.stringFixedEnum"
     },
     {
-     "$id": "171",
+     "$id": "153",
      "kind": "property",
      "name": "requiredUnknown",
      "serializedName": "requiredUnknown",
-     "description": "required unknown",
      "type": {
-      "$id": "172",
-      "kind": "any",
+      "$id": "154",
+      "kind": "unknown",
       "name": "unknown",
       "crossLanguageDefinitionId": "",
       "decorators": []
@@ -1678,18 +1469,18 @@
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.requiredUnknown"
     },
     {
-     "$id": "173",
+     "$id": "155",
      "kind": "property",
      "name": "optionalUnknown",
      "serializedName": "optionalUnknown",
-     "description": "optional unknown",
      "type": {
-      "$id": "174",
-      "kind": "any",
+      "$id": "156",
+      "kind": "unknown",
       "name": "unknown",
       "crossLanguageDefinitionId": "",
       "decorators": []
@@ -1697,649 +1488,257 @@
      "optional": true,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.optionalUnknown"
     },
     {
-     "$id": "175",
+     "$id": "157",
      "kind": "property",
      "name": "requiredRecordUnknown",
      "serializedName": "requiredRecordUnknown",
-     "description": "required record of unknown",
-     "type": {
-      "$id": "176",
-      "kind": "dict",
-      "keyType": {
-       "$id": "177",
-       "kind": "string",
-       "name": "string",
-       "crossLanguageDefinitionId": "TypeSpec.string",
-       "decorators": []
-      },
-      "valueType": {
-       "$id": "178",
-       "kind": "any",
-       "name": "unknown",
-       "crossLanguageDefinitionId": "",
-       "decorators": []
-      },
-      "decorators": []
-     },
-     "optional": false,
-     "readOnly": false,
-     "discriminator": false,
-     "decorators": [],
-     "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.requiredRecordUnknown"
-    },
-    {
-     "$id": "179",
-     "kind": "property",
-     "name": "optionalRecordUnknown",
-     "serializedName": "optionalRecordUnknown",
-     "description": "optional record of unknown",
      "type": {
-      "$id": "180",
+      "$id": "158",
       "kind": "dict",
       "keyType": {
-       "$id": "181",
-       "kind": "string",
-       "name": "string",
-       "crossLanguageDefinitionId": "TypeSpec.string",
-       "decorators": []
-      },
-      "valueType": {
-       "$id": "182",
-       "kind": "any",
-       "name": "unknown",
-       "crossLanguageDefinitionId": "",
-       "decorators": []
-      },
-      "decorators": []
-     },
-     "optional": true,
-     "readOnly": false,
-     "discriminator": false,
-     "decorators": [],
-     "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.optionalRecordUnknown"
-    },
-    {
-     "$id": "183",
-     "kind": "property",
-     "name": "readOnlyRequiredRecordUnknown",
-     "serializedName": "readOnlyRequiredRecordUnknown",
-     "description": "required readonly record of unknown",
-     "type": {
-      "$id": "184",
-      "kind": "dict",
-      "keyType": {
-       "$id": "185",
-       "kind": "string",
-       "name": "string",
-       "crossLanguageDefinitionId": "TypeSpec.string",
-       "decorators": []
-      },
-      "valueType": {
-       "$id": "186",
-       "kind": "any",
-       "name": "unknown",
-       "crossLanguageDefinitionId": "",
-       "decorators": []
-      },
-      "decorators": []
-     },
-     "optional": false,
-     "readOnly": true,
-     "discriminator": false,
-     "decorators": [],
-     "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.readOnlyRequiredRecordUnknown"
-    },
-    {
-     "$id": "187",
-     "kind": "property",
-     "name": "readOnlyOptionalRecordUnknown",
-     "serializedName": "readOnlyOptionalRecordUnknown",
-     "description": "optional readonly record of unknown",
-     "type": {
-      "$id": "188",
-      "kind": "dict",
-      "keyType": {
-       "$id": "189",
-       "kind": "string",
-       "name": "string",
-       "crossLanguageDefinitionId": "TypeSpec.string",
-       "decorators": []
-      },
-      "valueType": {
-       "$id": "190",
-       "kind": "any",
-       "name": "unknown",
-       "crossLanguageDefinitionId": "",
-       "decorators": []
-      },
-      "decorators": []
-     },
-     "optional": true,
-     "readOnly": true,
-     "discriminator": false,
-     "decorators": [],
-     "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.readOnlyOptionalRecordUnknown"
-    },
-    {
-     "$id": "191",
-     "kind": "property",
-     "name": "modelWithRequiredNullable",
-     "serializedName": "modelWithRequiredNullable",
-     "description": "this is a model with required nullable properties",
-     "type": {
-      "$id": "192",
-      "kind": "model",
-      "name": "ModelWithRequiredNullableProperties",
-      "crossLanguageDefinitionId": "BasicTypeSpec.ModelWithRequiredNullableProperties",
-      "usage": "Input,Output,Json",
-      "description": "A model with a few required nullable properties",
-      "decorators": [],
-      "properties": [
-       {
-        "$id": "193",
-        "kind": "property",
-        "name": "requiredNullablePrimitive",
-        "serializedName": "requiredNullablePrimitive",
-        "description": "required nullable primitive type",
-        "type": {
-         "$id": "194",
-         "kind": "nullable",
-         "type": {
-          "$id": "195",
-          "kind": "int32",
-          "name": "int32",
-          "crossLanguageDefinitionId": "TypeSpec.int32",
-          "decorators": []
-         }
-        },
-        "optional": false,
-        "readOnly": false,
-        "discriminator": false,
-        "decorators": [],
-        "crossLanguageDefinitionId": "BasicTypeSpec.ModelWithRequiredNullableProperties.requiredNullablePrimitive"
-       },
-       {
-        "$id": "196",
-        "kind": "property",
-        "name": "requiredExtensibleEnum",
-        "serializedName": "requiredExtensibleEnum",
-        "description": "required nullable extensible enum type",
-        "type": {
-         "$id": "197",
-         "kind": "nullable",
-         "type": {
-          "$ref": "28"
-         }
-        },
-        "optional": false,
-        "readOnly": false,
-        "discriminator": false,
-        "decorators": [],
-        "crossLanguageDefinitionId": "BasicTypeSpec.ModelWithRequiredNullableProperties.requiredExtensibleEnum"
-       },
-       {
-        "$id": "198",
-        "kind": "property",
-        "name": "requiredFixedEnum",
-        "serializedName": "requiredFixedEnum",
-        "description": "required nullable fixed enum type",
-        "type": {
-         "$id": "199",
-         "kind": "nullable",
-         "type": {
-          "$ref": "20"
-         }
-        },
-        "optional": false,
-        "readOnly": false,
-        "discriminator": false,
-        "decorators": [],
-        "crossLanguageDefinitionId": "BasicTypeSpec.ModelWithRequiredNullableProperties.requiredFixedEnum"
-       }
-      ]
-     },
-     "optional": false,
-     "readOnly": false,
-     "discriminator": false,
-     "decorators": [],
-     "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.modelWithRequiredNullable"
-    },
-    {
-     "$id": "200",
-     "kind": "property",
-     "name": "requiredBytes",
-     "serializedName": "requiredBytes",
-     "description": "Required bytes",
-     "type": {
-      "$id": "201",
-      "kind": "bytes",
-      "name": "bytes",
-      "encode": "base64",
-      "crossLanguageDefinitionId": "TypeSpec.bytes",
-      "decorators": []
-     },
-     "optional": false,
-     "readOnly": false,
-     "discriminator": false,
-     "decorators": [],
-     "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.requiredBytes"
-    }
-   ]
-  },
-  {
-   "$ref": "192"
-  },
-  {
-   "$id": "202",
-   "kind": "model",
-   "name": "AnonymousBodyRequest",
-   "crossLanguageDefinitionId": "BasicTypeSpec.anonymousBody.Request.anonymous",
-   "usage": "Spread,Json",
-   "decorators": [],
-   "properties": [
-    {
-     "$id": "203",
-     "kind": "property",
-     "name": "name",
-     "serializedName": "name",
-     "description": "name of the Thing",
-     "type": {
-      "$id": "204",
-      "kind": "string",
-      "name": "string",
-      "crossLanguageDefinitionId": "TypeSpec.string",
-      "decorators": []
-     },
-     "optional": false,
-     "readOnly": false,
-     "discriminator": false,
-     "decorators": [],
-     "crossLanguageDefinitionId": "BasicTypeSpec.anonymousBody.Request.anonymous.name"
-    },
-    {
-     "$id": "205",
-     "kind": "property",
-     "name": "requiredUnion",
-     "serializedName": "requiredUnion",
-     "description": "required Union",
-     "type": {
-      "$id": "206",
-      "kind": "union",
-      "name": "ThingRequiredUnion",
-      "variantTypes": [
-       {
-        "$id": "207",
-        "kind": "string",
-        "name": "string",
-        "crossLanguageDefinitionId": "TypeSpec.string",
-        "decorators": []
-       },
-       {
-        "$id": "208",
-        "kind": "array",
-        "name": "Array",
-        "valueType": {
-         "$id": "209",
-         "kind": "string",
-         "name": "string",
-         "crossLanguageDefinitionId": "TypeSpec.string",
-         "decorators": []
-        },
-        "crossLanguageDefinitionId": "TypeSpec.Array",
-        "decorators": []
-       },
-       {
-        "$id": "210",
-        "kind": "int32",
-        "name": "int32",
-        "crossLanguageDefinitionId": "TypeSpec.int32",
-        "decorators": []
-       }
-      ],
-      "decorators": []
-     },
-     "optional": false,
-     "readOnly": false,
-     "discriminator": false,
-     "decorators": [],
-     "crossLanguageDefinitionId": "BasicTypeSpec.anonymousBody.Request.anonymous.requiredUnion"
-    },
-    {
-     "$id": "211",
-     "kind": "property",
-     "name": "requiredLiteralString",
-     "serializedName": "requiredLiteralString",
-     "description": "required literal string",
-     "type": {
-      "$id": "212",
-      "kind": "constant",
-      "valueType": {
-       "$ref": "84"
-      },
-      "value": "accept",
-      "decorators": []
-     },
-     "optional": false,
-     "readOnly": false,
-     "discriminator": false,
-     "decorators": [],
-     "crossLanguageDefinitionId": "BasicTypeSpec.anonymousBody.Request.anonymous.requiredLiteralString"
-    },
-    {
-     "$id": "213",
-     "kind": "property",
-     "name": "requiredLiteralInt",
-     "serializedName": "requiredLiteralInt",
-     "description": "required literal int",
-     "type": {
-      "$id": "214",
-      "kind": "constant",
-      "valueType": {
-       "$ref": "87"
-      },
-      "value": 123,
-      "decorators": []
-     },
-     "optional": false,
-     "readOnly": false,
-     "discriminator": false,
-     "decorators": [],
-     "crossLanguageDefinitionId": "BasicTypeSpec.anonymousBody.Request.anonymous.requiredLiteralInt"
-    },
-    {
-     "$id": "215",
-     "kind": "property",
-     "name": "requiredLiteralFloat",
-     "serializedName": "requiredLiteralFloat",
-     "description": "required literal float",
-     "type": {
-      "$id": "216",
-      "kind": "constant",
-      "valueType": {
-       "$ref": "90"
-      },
-      "value": 1.23,
-      "decorators": []
-     },
-     "optional": false,
-     "readOnly": false,
-     "discriminator": false,
-     "decorators": [],
-     "crossLanguageDefinitionId": "BasicTypeSpec.anonymousBody.Request.anonymous.requiredLiteralFloat"
-    },
-    {
-     "$id": "217",
-     "kind": "property",
-     "name": "requiredLiteralBool",
-     "serializedName": "requiredLiteralBool",
-     "description": "required literal bool",
-     "type": {
-      "$id": "218",
-      "kind": "constant",
-      "valueType": {
-       "$id": "219",
-       "kind": "boolean",
-       "name": "boolean",
-       "crossLanguageDefinitionId": "TypeSpec.boolean",
-       "decorators": []
-      },
-      "value": false,
-      "decorators": []
-     },
-     "optional": false,
-     "readOnly": false,
-     "discriminator": false,
-     "decorators": [],
-     "crossLanguageDefinitionId": "BasicTypeSpec.anonymousBody.Request.anonymous.requiredLiteralBool"
-    },
-    {
-     "$id": "220",
-     "kind": "property",
-     "name": "optionalLiteralString",
-     "serializedName": "optionalLiteralString",
-     "description": "optional literal string",
-     "type": {
-      "$id": "221",
-      "kind": "constant",
-      "valueType": {
-       "$ref": "93"
-      },
-      "value": "reject",
-      "decorators": []
-     },
-     "optional": true,
-     "readOnly": false,
-     "discriminator": false,
-     "decorators": [],
-     "crossLanguageDefinitionId": "BasicTypeSpec.anonymousBody.Request.anonymous.optionalLiteralString"
-    },
-    {
-     "$id": "222",
-     "kind": "property",
-     "name": "optionalLiteralInt",
-     "serializedName": "optionalLiteralInt",
-     "description": "optional literal int",
-     "type": {
-      "$id": "223",
-      "kind": "constant",
-      "valueType": {
-       "$ref": "96"
-      },
-      "value": 456,
-      "decorators": []
-     },
-     "optional": true,
-     "readOnly": false,
-     "discriminator": false,
-     "decorators": [],
-     "crossLanguageDefinitionId": "BasicTypeSpec.anonymousBody.Request.anonymous.optionalLiteralInt"
-    },
-    {
-     "$id": "224",
-     "kind": "property",
-     "name": "optionalLiteralFloat",
-     "serializedName": "optionalLiteralFloat",
-     "description": "optional literal float",
-     "type": {
-      "$id": "225",
-      "kind": "constant",
+       "$id": "159",
+       "kind": "string",
+       "name": "string",
+       "crossLanguageDefinitionId": "TypeSpec.string",
+       "decorators": []
+      },
       "valueType": {
-       "$ref": "99"
+       "$id": "160",
+       "kind": "unknown",
+       "name": "unknown",
+       "crossLanguageDefinitionId": "",
+       "decorators": []
       },
-      "value": 4.56,
       "decorators": []
      },
-     "optional": true,
+     "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
-     "crossLanguageDefinitionId": "BasicTypeSpec.anonymousBody.Request.anonymous.optionalLiteralFloat"
+     "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.requiredRecordUnknown"
     },
     {
-     "$id": "226",
+     "$id": "161",
      "kind": "property",
-     "name": "optionalLiteralBool",
-     "serializedName": "optionalLiteralBool",
-     "description": "optional literal bool",
+     "name": "optionalRecordUnknown",
+     "serializedName": "optionalRecordUnknown",
      "type": {
-      "$id": "227",
-      "kind": "constant",
+      "$id": "162",
+      "kind": "dict",
+      "keyType": {
+       "$id": "163",
+       "kind": "string",
+       "name": "string",
+       "crossLanguageDefinitionId": "TypeSpec.string",
+       "decorators": []
+      },
       "valueType": {
-       "$id": "228",
-       "kind": "boolean",
-       "name": "boolean",
-       "crossLanguageDefinitionId": "TypeSpec.boolean",
+       "$id": "164",
+       "kind": "unknown",
+       "name": "unknown",
+       "crossLanguageDefinitionId": "",
        "decorators": []
       },
-      "value": true,
       "decorators": []
      },
      "optional": true,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
-     "crossLanguageDefinitionId": "BasicTypeSpec.anonymousBody.Request.anonymous.optionalLiteralBool"
+     "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.optionalRecordUnknown"
     },
     {
-     "$id": "229",
+     "$id": "165",
      "kind": "property",
-     "name": "requiredBadDescription",
-     "serializedName": "requiredBadDescription",
-     "description": "description with xml <|endoftext|>",
+     "name": "readOnlyRequiredRecordUnknown",
+     "serializedName": "readOnlyRequiredRecordUnknown",
      "type": {
-      "$id": "230",
-      "kind": "string",
-      "name": "string",
-      "crossLanguageDefinitionId": "TypeSpec.string",
+      "$id": "166",
+      "kind": "dict",
+      "keyType": {
+       "$id": "167",
+       "kind": "string",
+       "name": "string",
+       "crossLanguageDefinitionId": "TypeSpec.string",
+       "decorators": []
+      },
+      "valueType": {
+       "$id": "168",
+       "kind": "unknown",
+       "name": "unknown",
+       "crossLanguageDefinitionId": "",
+       "decorators": []
+      },
       "decorators": []
      },
      "optional": false,
-     "readOnly": false,
+     "readOnly": true,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
-     "crossLanguageDefinitionId": "BasicTypeSpec.anonymousBody.Request.anonymous.requiredBadDescription"
+     "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.readOnlyRequiredRecordUnknown"
     },
     {
-     "$id": "231",
+     "$id": "169",
      "kind": "property",
-     "name": "optionalNullableList",
-     "serializedName": "optionalNullableList",
-     "description": "optional nullable collection",
+     "name": "readOnlyOptionalRecordUnknown",
+     "serializedName": "readOnlyOptionalRecordUnknown",
      "type": {
-      "$id": "232",
-      "kind": "nullable",
-      "type": {
-       "$id": "233",
-       "kind": "array",
-       "name": "Array",
-       "valueType": {
-        "$id": "234",
-        "kind": "int32",
-        "name": "int32",
-        "crossLanguageDefinitionId": "TypeSpec.int32",
-        "decorators": []
-       },
-       "crossLanguageDefinitionId": "TypeSpec.Array",
+      "$id": "170",
+      "kind": "dict",
+      "keyType": {
+       "$id": "171",
+       "kind": "string",
+       "name": "string",
+       "crossLanguageDefinitionId": "TypeSpec.string",
        "decorators": []
-      }
+      },
+      "valueType": {
+       "$id": "172",
+       "kind": "unknown",
+       "name": "unknown",
+       "crossLanguageDefinitionId": "",
+       "decorators": []
+      },
+      "decorators": []
      },
      "optional": true,
-     "readOnly": false,
+     "readOnly": true,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
-     "crossLanguageDefinitionId": "BasicTypeSpec.anonymousBody.Request.anonymous.optionalNullableList"
+     "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.readOnlyOptionalRecordUnknown"
     },
     {
-     "$id": "235",
+     "$id": "173",
      "kind": "property",
-     "name": "requiredNullableList",
-     "serializedName": "requiredNullableList",
-     "description": "required nullable collection",
+     "name": "modelWithRequiredNullable",
+     "serializedName": "modelWithRequiredNullable",
      "type": {
-      "$id": "236",
-      "kind": "nullable",
-      "type": {
-       "$id": "237",
-       "kind": "array",
-       "name": "Array",
-       "valueType": {
-        "$id": "238",
-        "kind": "int32",
-        "name": "int32",
-        "crossLanguageDefinitionId": "TypeSpec.int32",
-        "decorators": []
+      "$id": "174",
+      "kind": "model",
+      "name": "ModelWithRequiredNullableProperties",
+      "crossLanguageDefinitionId": "BasicTypeSpec.ModelWithRequiredNullableProperties",
+      "usage": "Input,Output,Json",
+      "decorators": [],
+      "properties": [
+       {
+        "$id": "175",
+        "kind": "property",
+        "name": "requiredNullablePrimitive",
+        "serializedName": "requiredNullablePrimitive",
+        "type": {
+         "$id": "176",
+         "kind": "nullable",
+         "type": {
+          "$id": "177",
+          "kind": "int32",
+          "name": "int32",
+          "crossLanguageDefinitionId": "TypeSpec.int32",
+          "decorators": []
+         }
+        },
+        "optional": false,
+        "readOnly": false,
+        "discriminator": false,
+        "flatten": false,
+        "decorators": [],
+        "crossLanguageDefinitionId": "BasicTypeSpec.ModelWithRequiredNullableProperties.requiredNullablePrimitive"
        },
-       "crossLanguageDefinitionId": "TypeSpec.Array",
-       "decorators": []
-      }
+       {
+        "$id": "178",
+        "kind": "property",
+        "name": "requiredExtensibleEnum",
+        "serializedName": "requiredExtensibleEnum",
+        "type": {
+         "$id": "179",
+         "kind": "nullable",
+         "type": {
+          "$ref": "28"
+         }
+        },
+        "optional": false,
+        "readOnly": false,
+        "discriminator": false,
+        "flatten": false,
+        "decorators": [],
+        "crossLanguageDefinitionId": "BasicTypeSpec.ModelWithRequiredNullableProperties.requiredExtensibleEnum"
+       },
+       {
+        "$id": "180",
+        "kind": "property",
+        "name": "requiredFixedEnum",
+        "serializedName": "requiredFixedEnum",
+        "type": {
+         "$id": "181",
+         "kind": "nullable",
+         "type": {
+          "$ref": "20"
+         }
+        },
+        "optional": false,
+        "readOnly": false,
+        "discriminator": false,
+        "flatten": false,
+        "decorators": [],
+        "crossLanguageDefinitionId": "BasicTypeSpec.ModelWithRequiredNullableProperties.requiredFixedEnum"
+       }
+      ]
      },
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
-     "crossLanguageDefinitionId": "BasicTypeSpec.anonymousBody.Request.anonymous.requiredNullableList"
-    }
-   ]
-  },
-  {
-   "$id": "239",
-   "kind": "model",
-   "name": "FriendlyModelRequest",
-   "crossLanguageDefinitionId": "BasicTypeSpec.friendlyModel.Request.anonymous",
-   "usage": "Spread,Json",
-   "decorators": [],
-   "properties": [
+     "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.modelWithRequiredNullable"
+    },
     {
-     "$id": "240",
+     "$id": "182",
      "kind": "property",
-     "name": "name",
-     "serializedName": "name",
-     "description": "name of the NotFriend",
+     "name": "requiredBytes",
+     "serializedName": "requiredBytes",
      "type": {
-      "$id": "241",
-      "kind": "string",
-      "name": "string",
-      "crossLanguageDefinitionId": "TypeSpec.string",
+      "$id": "183",
+      "kind": "bytes",
+      "name": "bytes",
+      "encode": "base64",
+      "crossLanguageDefinitionId": "TypeSpec.bytes",
       "decorators": []
      },
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
-     "crossLanguageDefinitionId": "BasicTypeSpec.friendlyModel.Request.anonymous.name"
+     "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel.requiredBytes"
     }
    ]
   },
   {
-   "$id": "242",
-   "kind": "model",
-   "name": "Friend",
-   "crossLanguageDefinitionId": "BasicTypeSpec.NotFriend",
-   "usage": "Output,Json",
-   "description": "this is not a friendly model but with a friendly name",
-   "decorators": [],
-   "properties": [
-    {
-     "$id": "243",
-     "kind": "property",
-     "name": "name",
-     "serializedName": "name",
-     "description": "name of the NotFriend",
-     "type": {
-      "$id": "244",
-      "kind": "string",
-      "name": "string",
-      "crossLanguageDefinitionId": "TypeSpec.string",
-      "decorators": []
-     },
-     "optional": false,
-     "readOnly": false,
-     "discriminator": false,
-     "decorators": [],
-     "crossLanguageDefinitionId": "BasicTypeSpec.NotFriend.name"
-    }
-   ]
+   "$ref": "174"
   },
   {
-   "$id": "245",
+   "$id": "184",
    "kind": "model",
-   "name": "ProjectedNameModelRequest",
-   "crossLanguageDefinitionId": "BasicTypeSpec.projectedNameModel.Request.anonymous",
+   "name": "Friend",
+   "crossLanguageDefinitionId": "BasicTypeSpec.NotFriend",
    "usage": "Spread,Json",
    "decorators": [],
    "properties": [
     {
-     "$id": "246",
+     "$id": "185",
      "kind": "property",
      "name": "name",
      "serializedName": "name",
-     "description": "name of the ModelWithProjectedName",
      "type": {
-      "$id": "247",
+      "$id": "186",
       "kind": "string",
       "name": "string",
       "crossLanguageDefinitionId": "TypeSpec.string",
@@ -2348,28 +1747,27 @@
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
-     "crossLanguageDefinitionId": "BasicTypeSpec.projectedNameModel.Request.anonymous.name"
+     "crossLanguageDefinitionId": "BasicTypeSpec.NotFriend.name"
     }
    ]
   },
   {
-   "$id": "248",
+   "$id": "187",
    "kind": "model",
    "name": "ProjectedModel",
    "crossLanguageDefinitionId": "BasicTypeSpec.ModelWithProjectedName",
-   "usage": "Output,Json",
-   "description": "this is a model with a projected name",
+   "usage": "Spread,Json",
    "decorators": [],
    "properties": [
     {
-     "$id": "249",
+     "$id": "188",
      "kind": "property",
      "name": "name",
      "serializedName": "name",
-     "description": "name of the ModelWithProjectedName",
      "type": {
-      "$id": "250",
+      "$id": "189",
       "kind": "string",
       "name": "string",
       "crossLanguageDefinitionId": "TypeSpec.string",
@@ -2378,13 +1776,14 @@
      "optional": false,
      "readOnly": false,
      "discriminator": false,
+     "flatten": false,
      "decorators": [],
      "crossLanguageDefinitionId": "BasicTypeSpec.ModelWithProjectedName.name"
     }
    ]
   },
   {
-   "$id": "251",
+   "$id": "190",
    "kind": "model",
    "name": "ReturnsAnonymousModelResponse",
    "crossLanguageDefinitionId": "BasicTypeSpec.returnsAnonymousModel.Response.anonymous",
@@ -2395,23 +1794,22 @@
  ],
  "Clients": [
   {
-   "$id": "252",
+   "$id": "191",
    "Name": "BasicTypeSpecClient",
-   "Description": "This is a sample typespec project.",
    "Operations": [
     {
-     "$id": "253",
+     "$id": "192",
      "Name": "sayHi",
      "ResourceName": "BasicTypeSpec",
      "Description": "Return hi",
      "Accessibility": "public",
      "Parameters": [
       {
-       "$id": "254",
+       "$id": "193",
        "Name": "basicTypeSpecUrl",
        "NameInRequest": "basicTypeSpecUrl",
        "Type": {
-        "$id": "255",
+        "$id": "194",
         "kind": "url",
         "name": "url",
         "crossLanguageDefinitionId": "TypeSpec.url"
@@ -2427,11 +1825,11 @@
        "Kind": "Client"
       },
       {
-       "$id": "256",
+       "$id": "195",
        "Name": "headParameter",
        "NameInRequest": "head-parameter",
        "Type": {
-        "$id": "257",
+        "$id": "196",
         "kind": "string",
         "name": "string",
         "crossLanguageDefinitionId": "TypeSpec.string",
@@ -2448,11 +1846,11 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "258",
+       "$id": "197",
        "Name": "queryParameter",
        "NameInRequest": "queryParameter",
        "Type": {
-        "$id": "259",
+        "$id": "198",
         "kind": "string",
         "name": "string",
         "crossLanguageDefinitionId": "TypeSpec.string",
@@ -2469,11 +1867,11 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "260",
+       "$id": "199",
        "Name": "optionalQuery",
        "NameInRequest": "optionalQuery",
        "Type": {
-        "$id": "261",
+        "$id": "200",
         "kind": "string",
         "name": "string",
         "crossLanguageDefinitionId": "TypeSpec.string",
@@ -2490,14 +1888,14 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "262",
+       "$id": "201",
        "Name": "accept",
        "NameInRequest": "Accept",
        "Type": {
-        "$id": "263",
+        "$id": "202",
         "kind": "constant",
         "valueType": {
-         "$id": "264",
+         "$id": "203",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -2519,12 +1917,12 @@
      ],
      "Responses": [
       {
-       "$id": "265",
+       "$id": "204",
        "StatusCodes": [
         200
        ],
        "BodyType": {
-        "$ref": "108"
+        "$ref": "90"
        },
        "BodyMediaType": "Json",
        "Headers": [],
@@ -2545,21 +1943,21 @@
      "Decorators": []
     },
     {
-     "$id": "266",
+     "$id": "205",
      "Name": "helloAgain",
      "ResourceName": "BasicTypeSpec",
      "Description": "Return hi again",
      "Accessibility": "public",
      "Parameters": [
       {
-       "$ref": "254"
+       "$ref": "193"
       },
       {
-       "$id": "267",
+       "$id": "206",
        "Name": "p1",
        "NameInRequest": "p1",
        "Type": {
-        "$id": "268",
+        "$id": "207",
         "kind": "string",
         "name": "string",
         "crossLanguageDefinitionId": "TypeSpec.string",
@@ -2576,14 +1974,14 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "269",
+       "$id": "208",
        "Name": "contentType",
        "NameInRequest": "Content-Type",
        "Type": {
-        "$id": "270",
+        "$id": "209",
         "kind": "constant",
         "valueType": {
-         "$id": "271",
+         "$id": "210",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -2603,11 +2001,11 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "272",
+       "$id": "211",
        "Name": "p2",
        "NameInRequest": "p2",
        "Type": {
-        "$id": "273",
+        "$id": "212",
         "kind": "string",
         "name": "string",
         "crossLanguageDefinitionId": "TypeSpec.string",
@@ -2624,14 +2022,14 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "274",
+       "$id": "213",
        "Name": "accept",
        "NameInRequest": "Accept",
        "Type": {
-        "$id": "275",
+        "$id": "214",
         "kind": "constant",
         "valueType": {
-         "$id": "276",
+         "$id": "215",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -2651,11 +2049,11 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "277",
+       "$id": "216",
        "Name": "action",
        "NameInRequest": "action",
        "Type": {
-        "$ref": "145"
+        "$ref": "127"
        },
        "Location": "Body",
        "IsApiVersion": false,
@@ -2670,12 +2068,12 @@
      ],
      "Responses": [
       {
-       "$id": "278",
+       "$id": "217",
        "StatusCodes": [
         200
        ],
        "BodyType": {
-        "$ref": "145"
+        "$ref": "127"
        },
        "BodyMediaType": "Json",
        "Headers": [],
@@ -2699,21 +2097,21 @@
      "Decorators": []
     },
     {
-     "$id": "279",
+     "$id": "218",
      "Name": "noContentType",
      "ResourceName": "BasicTypeSpec",
      "Description": "Return hi again",
      "Accessibility": "public",
      "Parameters": [
       {
-       "$ref": "254"
+       "$ref": "193"
       },
       {
-       "$id": "280",
+       "$id": "219",
        "Name": "p1",
        "NameInRequest": "p1",
        "Type": {
-        "$id": "281",
+        "$id": "220",
         "kind": "string",
         "name": "string",
         "crossLanguageDefinitionId": "TypeSpec.string",
@@ -2730,11 +2128,11 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "282",
+       "$id": "221",
        "Name": "p2",
        "NameInRequest": "p2",
        "Type": {
-        "$id": "283",
+        "$id": "222",
         "kind": "string",
         "name": "string",
         "crossLanguageDefinitionId": "TypeSpec.string",
@@ -2751,15 +2149,14 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "284",
+       "$id": "223",
        "Name": "contentType",
        "NameInRequest": "Content-Type",
-       "Description": "Body parameter's content type. Known values are application/json",
        "Type": {
-        "$id": "285",
+        "$id": "224",
         "kind": "constant",
         "valueType": {
-         "$id": "286",
+         "$id": "225",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -2779,14 +2176,14 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "287",
+       "$id": "226",
        "Name": "accept",
        "NameInRequest": "Accept",
        "Type": {
-        "$id": "288",
+        "$id": "227",
         "kind": "constant",
         "valueType": {
-         "$id": "289",
+         "$id": "228",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -2806,11 +2203,11 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "290",
+       "$id": "229",
        "Name": "action",
        "NameInRequest": "action",
        "Type": {
-        "$ref": "145"
+        "$ref": "127"
        },
        "Location": "Body",
        "IsApiVersion": false,
@@ -2825,12 +2222,12 @@
      ],
      "Responses": [
       {
-       "$id": "291",
+       "$id": "230",
        "StatusCodes": [
         200
        ],
        "BodyType": {
-        "$ref": "145"
+        "$ref": "127"
        },
        "BodyMediaType": "Json",
        "Headers": [],
@@ -2854,24 +2251,24 @@
      "Decorators": []
     },
     {
-     "$id": "292",
+     "$id": "231",
      "Name": "helloDemo2",
      "ResourceName": "BasicTypeSpec",
      "Description": "Return hi in demo2",
      "Accessibility": "public",
      "Parameters": [
       {
-       "$ref": "254"
+       "$ref": "193"
       },
       {
-       "$id": "293",
+       "$id": "232",
        "Name": "accept",
        "NameInRequest": "Accept",
        "Type": {
-        "$id": "294",
+        "$id": "233",
         "kind": "constant",
         "valueType": {
-         "$id": "295",
+         "$id": "234",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -2893,12 +2290,12 @@
      ],
      "Responses": [
       {
-       "$id": "296",
+       "$id": "235",
        "StatusCodes": [
         200
        ],
        "BodyType": {
-        "$ref": "108"
+        "$ref": "90"
        },
        "BodyMediaType": "Json",
        "Headers": [],
@@ -2919,25 +2316,24 @@
      "Decorators": []
     },
     {
-     "$id": "297",
+     "$id": "236",
      "Name": "createLiteral",
      "ResourceName": "BasicTypeSpec",
      "Description": "Create with literal value",
      "Accessibility": "public",
      "Parameters": [
       {
-       "$ref": "254"
+       "$ref": "193"
       },
       {
-       "$id": "298",
+       "$id": "237",
        "Name": "contentType",
        "NameInRequest": "Content-Type",
-       "Description": "Body parameter's content type. Known values are application/json",
        "Type": {
-        "$id": "299",
+        "$id": "238",
         "kind": "constant",
         "valueType": {
-         "$id": "300",
+         "$id": "239",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -2957,14 +2353,14 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "301",
+       "$id": "240",
        "Name": "accept",
        "NameInRequest": "Accept",
        "Type": {
-        "$id": "302",
+        "$id": "241",
         "kind": "constant",
         "valueType": {
-         "$id": "303",
+         "$id": "242",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -2984,11 +2380,11 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "304",
+       "$id": "243",
        "Name": "body",
        "NameInRequest": "body",
        "Type": {
-        "$ref": "108"
+        "$ref": "90"
        },
        "Location": "Body",
        "IsApiVersion": false,
@@ -3003,12 +2399,12 @@
      ],
      "Responses": [
       {
-       "$id": "305",
+       "$id": "244",
        "StatusCodes": [
         200
        ],
        "BodyType": {
-        "$ref": "108"
+        "$ref": "90"
        },
        "BodyMediaType": "Json",
        "Headers": [],
@@ -3032,24 +2428,24 @@
      "Decorators": []
     },
     {
-     "$id": "306",
+     "$id": "245",
      "Name": "helloLiteral",
      "ResourceName": "BasicTypeSpec",
      "Description": "Send literal parameters",
      "Accessibility": "public",
      "Parameters": [
       {
-       "$ref": "254"
+       "$ref": "193"
       },
       {
-       "$id": "307",
+       "$id": "246",
        "Name": "p1",
        "NameInRequest": "p1",
        "Type": {
-        "$id": "308",
+        "$id": "247",
         "kind": "constant",
         "valueType": {
-         "$id": "309",
+         "$id": "248",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -3069,14 +2465,14 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "310",
+       "$id": "249",
        "Name": "p2",
        "NameInRequest": "p2",
        "Type": {
-        "$id": "311",
+        "$id": "250",
         "kind": "constant",
         "valueType": {
-         "$id": "312",
+         "$id": "251",
          "kind": "int32",
          "name": "int32",
          "crossLanguageDefinitionId": "TypeSpec.int32",
@@ -3096,14 +2492,14 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "313",
+       "$id": "252",
        "Name": "p3",
        "NameInRequest": "p3",
        "Type": {
-        "$id": "314",
+        "$id": "253",
         "kind": "constant",
         "valueType": {
-         "$id": "315",
+         "$id": "254",
          "kind": "boolean",
          "name": "boolean",
          "crossLanguageDefinitionId": "TypeSpec.boolean",
@@ -3123,14 +2519,14 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "316",
+       "$id": "255",
        "Name": "accept",
        "NameInRequest": "Accept",
        "Type": {
-        "$id": "317",
+        "$id": "256",
         "kind": "constant",
         "valueType": {
-         "$id": "318",
+         "$id": "257",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -3152,12 +2548,12 @@
      ],
      "Responses": [
       {
-       "$id": "319",
+       "$id": "258",
        "StatusCodes": [
         200
        ],
        "BodyType": {
-        "$ref": "108"
+        "$ref": "90"
        },
        "BodyMediaType": "Json",
        "Headers": [],
@@ -3178,26 +2574,26 @@
      "Decorators": []
     },
     {
-     "$id": "320",
+     "$id": "259",
      "Name": "topAction",
      "ResourceName": "BasicTypeSpec",
      "Description": "top level method",
      "Accessibility": "public",
      "Parameters": [
       {
-       "$ref": "254"
+       "$ref": "193"
       },
       {
-       "$id": "321",
+       "$id": "260",
        "Name": "action",
        "NameInRequest": "action",
        "Type": {
-        "$id": "322",
+        "$id": "261",
         "kind": "utcDateTime",
         "name": "utcDateTime",
         "encode": "rfc3339",
         "wireType": {
-         "$id": "323",
+         "$id": "262",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -3217,14 +2613,14 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "324",
+       "$id": "263",
        "Name": "accept",
        "NameInRequest": "Accept",
        "Type": {
-        "$id": "325",
+        "$id": "264",
         "kind": "constant",
         "valueType": {
-         "$id": "326",
+         "$id": "265",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -3246,12 +2642,12 @@
      ],
      "Responses": [
       {
-       "$id": "327",
+       "$id": "266",
        "StatusCodes": [
         200
        ],
        "BodyType": {
-        "$ref": "108"
+        "$ref": "90"
        },
        "BodyMediaType": "Json",
        "Headers": [],
@@ -3272,24 +2668,24 @@
      "Decorators": []
     },
     {
-     "$id": "328",
+     "$id": "267",
      "Name": "topAction2",
      "ResourceName": "BasicTypeSpec",
      "Description": "top level method2",
      "Accessibility": "public",
      "Parameters": [
       {
-       "$ref": "254"
+       "$ref": "193"
       },
       {
-       "$id": "329",
+       "$id": "268",
        "Name": "accept",
        "NameInRequest": "Accept",
        "Type": {
-        "$id": "330",
+        "$id": "269",
         "kind": "constant",
         "valueType": {
-         "$id": "331",
+         "$id": "270",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -3311,12 +2707,12 @@
      ],
      "Responses": [
       {
-       "$id": "332",
+       "$id": "271",
        "StatusCodes": [
         200
        ],
        "BodyType": {
-        "$ref": "108"
+        "$ref": "90"
        },
        "BodyMediaType": "Json",
        "Headers": [],
@@ -3337,25 +2733,24 @@
      "Decorators": []
     },
     {
-     "$id": "333",
+     "$id": "272",
      "Name": "patchAction",
      "ResourceName": "BasicTypeSpec",
      "Description": "top level patch",
      "Accessibility": "public",
      "Parameters": [
       {
-       "$ref": "254"
+       "$ref": "193"
       },
       {
-       "$id": "334",
+       "$id": "273",
        "Name": "contentType",
        "NameInRequest": "Content-Type",
-       "Description": "Body parameter's content type. Known values are application/json",
        "Type": {
-        "$id": "335",
+        "$id": "274",
         "kind": "constant",
         "valueType": {
-         "$id": "336",
+         "$id": "275",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -3375,14 +2770,14 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "337",
+       "$id": "276",
        "Name": "accept",
        "NameInRequest": "Accept",
        "Type": {
-        "$id": "338",
+        "$id": "277",
         "kind": "constant",
         "valueType": {
-         "$id": "339",
+         "$id": "278",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -3402,11 +2797,11 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "340",
+       "$id": "279",
        "Name": "body",
        "NameInRequest": "body",
        "Type": {
-        "$ref": "108"
+        "$ref": "90"
        },
        "Location": "Body",
        "IsApiVersion": false,
@@ -3421,12 +2816,12 @@
      ],
      "Responses": [
       {
-       "$id": "341",
+       "$id": "280",
        "StatusCodes": [
         200
        ],
        "BodyType": {
-        "$ref": "108"
+        "$ref": "90"
        },
        "BodyMediaType": "Json",
        "Headers": [],
@@ -3450,25 +2845,24 @@
      "Decorators": []
     },
     {
-     "$id": "342",
+     "$id": "281",
      "Name": "anonymousBody",
      "ResourceName": "BasicTypeSpec",
      "Description": "body parameter without body decorator",
      "Accessibility": "public",
      "Parameters": [
       {
-       "$ref": "254"
+       "$ref": "193"
       },
       {
-       "$id": "343",
+       "$id": "282",
        "Name": "contentType",
        "NameInRequest": "Content-Type",
-       "Description": "Body parameter's content type. Known values are application/json",
        "Type": {
-        "$id": "344",
+        "$id": "283",
         "kind": "constant",
         "valueType": {
-         "$id": "345",
+         "$id": "284",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -3488,14 +2882,14 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "346",
+       "$id": "285",
        "Name": "accept",
        "NameInRequest": "Accept",
        "Type": {
-        "$id": "347",
+        "$id": "286",
         "kind": "constant",
         "valueType": {
-         "$id": "348",
+         "$id": "287",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -3515,11 +2909,11 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "349",
-       "Name": "anonymousBodyRequest",
-       "NameInRequest": "anonymousBodyRequest",
+       "$id": "288",
+       "Name": "thing",
+       "NameInRequest": "thing",
        "Type": {
-        "$ref": "202"
+        "$ref": "90"
        },
        "Location": "Body",
        "IsApiVersion": false,
@@ -3534,12 +2928,12 @@
      ],
      "Responses": [
       {
-       "$id": "350",
+       "$id": "289",
        "StatusCodes": [
         200
        ],
        "BodyType": {
-        "$ref": "108"
+        "$ref": "90"
        },
        "BodyMediaType": "Json",
        "Headers": [],
@@ -3563,25 +2957,24 @@
      "Decorators": []
     },
     {
-     "$id": "351",
+     "$id": "290",
      "Name": "friendlyModel",
      "ResourceName": "BasicTypeSpec",
      "Description": "Model can have its friendly name",
      "Accessibility": "public",
      "Parameters": [
       {
-       "$ref": "254"
+       "$ref": "193"
       },
       {
-       "$id": "352",
+       "$id": "291",
        "Name": "contentType",
        "NameInRequest": "Content-Type",
-       "Description": "Body parameter's content type. Known values are application/json",
        "Type": {
-        "$id": "353",
+        "$id": "292",
         "kind": "constant",
         "valueType": {
-         "$id": "354",
+         "$id": "293",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -3601,14 +2994,14 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "355",
+       "$id": "294",
        "Name": "accept",
        "NameInRequest": "Accept",
        "Type": {
-        "$id": "356",
+        "$id": "295",
         "kind": "constant",
         "valueType": {
-         "$id": "357",
+         "$id": "296",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -3628,11 +3021,11 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "358",
-       "Name": "friendlyModelRequest",
-       "NameInRequest": "friendlyModelRequest",
+       "$id": "297",
+       "Name": "friend",
+       "NameInRequest": "friend",
        "Type": {
-        "$ref": "239"
+        "$ref": "184"
        },
        "Location": "Body",
        "IsApiVersion": false,
@@ -3647,12 +3040,12 @@
      ],
      "Responses": [
       {
-       "$id": "359",
+       "$id": "298",
        "StatusCodes": [
         200
        ],
        "BodyType": {
-        "$ref": "242"
+        "$ref": "184"
        },
        "BodyMediaType": "Json",
        "Headers": [],
@@ -3676,25 +3069,25 @@
      "Decorators": []
     },
     {
-     "$id": "360",
+     "$id": "299",
      "Name": "addTimeHeader",
      "ResourceName": "BasicTypeSpec",
      "Accessibility": "public",
      "Parameters": [
       {
-       "$ref": "254"
+       "$ref": "193"
       },
       {
-       "$id": "361",
+       "$id": "300",
        "Name": "repeatabilityFirstSent",
        "NameInRequest": "Repeatability-First-Sent",
        "Type": {
-        "$id": "362",
+        "$id": "301",
         "kind": "utcDateTime",
         "name": "utcDateTime",
         "encode": "rfc7231",
         "wireType": {
-         "$id": "363",
+         "$id": "302",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -3716,7 +3109,7 @@
      ],
      "Responses": [
       {
-       "$id": "364",
+       "$id": "303",
        "StatusCodes": [
         204
        ],
@@ -3736,25 +3129,24 @@
      "Decorators": []
     },
     {
-     "$id": "365",
+     "$id": "304",
      "Name": "projectedNameModel",
      "ResourceName": "BasicTypeSpec",
      "Description": "Model can have its projected name",
      "Accessibility": "public",
      "Parameters": [
       {
-       "$ref": "254"
+       "$ref": "193"
       },
       {
-       "$id": "366",
+       "$id": "305",
        "Name": "contentType",
        "NameInRequest": "Content-Type",
-       "Description": "Body parameter's content type. Known values are application/json",
        "Type": {
-        "$id": "367",
+        "$id": "306",
         "kind": "constant",
         "valueType": {
-         "$id": "368",
+         "$id": "307",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -3774,14 +3166,14 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "369",
+       "$id": "308",
        "Name": "accept",
        "NameInRequest": "Accept",
        "Type": {
-        "$id": "370",
+        "$id": "309",
         "kind": "constant",
         "valueType": {
-         "$id": "371",
+         "$id": "310",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -3801,11 +3193,11 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "372",
-       "Name": "projectedNameModelRequest",
-       "NameInRequest": "projectedNameModelRequest",
+       "$id": "311",
+       "Name": "projectedModel",
+       "NameInRequest": "projectedModel",
        "Type": {
-        "$ref": "245"
+        "$ref": "187"
        },
        "Location": "Body",
        "IsApiVersion": false,
@@ -3820,12 +3212,12 @@
      ],
      "Responses": [
       {
-       "$id": "373",
+       "$id": "312",
        "StatusCodes": [
         200
        ],
        "BodyType": {
-        "$ref": "248"
+        "$ref": "187"
        },
        "BodyMediaType": "Json",
        "Headers": [],
@@ -3849,24 +3241,24 @@
      "Decorators": []
     },
     {
-     "$id": "374",
+     "$id": "313",
      "Name": "returnsAnonymousModel",
      "ResourceName": "BasicTypeSpec",
      "Description": "return anonymous model",
      "Accessibility": "public",
      "Parameters": [
       {
-       "$ref": "254"
+       "$ref": "193"
       },
       {
-       "$id": "375",
+       "$id": "314",
        "Name": "accept",
        "NameInRequest": "Accept",
        "Type": {
-        "$id": "376",
+        "$id": "315",
         "kind": "constant",
         "valueType": {
-         "$id": "377",
+         "$id": "316",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -3888,12 +3280,12 @@
      ],
      "Responses": [
       {
-       "$id": "378",
+       "$id": "317",
        "StatusCodes": [
         200
        ],
        "BodyType": {
-        "$ref": "251"
+        "$ref": "190"
        },
        "BodyMediaType": "Json",
        "Headers": [],
@@ -3914,21 +3306,21 @@
      "Decorators": []
     },
     {
-     "$id": "379",
+     "$id": "318",
      "Name": "getUnknownValue",
      "ResourceName": "BasicTypeSpec",
      "Description": "get extensible enum",
      "Accessibility": "public",
      "Parameters": [
       {
-       "$ref": "254"
+       "$ref": "193"
       },
       {
-       "$id": "380",
+       "$id": "319",
        "Name": "accept",
        "NameInRequest": "Accept",
        "Type": {
-        "$id": "381",
+        "$id": "320",
         "kind": "string",
         "name": "string",
         "crossLanguageDefinitionId": "TypeSpec.string",
@@ -3947,15 +3339,15 @@
      ],
      "Responses": [
       {
-       "$id": "382",
+       "$id": "321",
        "StatusCodes": [
         200
        ],
        "BodyType": {
-        "$id": "383",
+        "$id": "322",
         "kind": "constant",
         "valueType": {
-         "$id": "384",
+         "$id": "323",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -3990,25 +3382,24 @@
      "Decorators": []
     },
     {
-     "$id": "385",
+     "$id": "324",
      "Name": "internalProtocol",
      "ResourceName": "BasicTypeSpec",
      "Description": "When set protocol false and convenient true, then the protocol method should be internal",
      "Accessibility": "public",
      "Parameters": [
       {
-       "$ref": "254"
+       "$ref": "193"
       },
       {
-       "$id": "386",
+       "$id": "325",
        "Name": "contentType",
        "NameInRequest": "Content-Type",
-       "Description": "Body parameter's content type. Known values are application/json",
        "Type": {
-        "$id": "387",
+        "$id": "326",
         "kind": "constant",
         "valueType": {
-         "$id": "388",
+         "$id": "327",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -4028,14 +3419,14 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "389",
+       "$id": "328",
        "Name": "accept",
        "NameInRequest": "Accept",
        "Type": {
-        "$id": "390",
+        "$id": "329",
         "kind": "constant",
         "valueType": {
-         "$id": "391",
+         "$id": "330",
          "kind": "string",
          "name": "string",
          "crossLanguageDefinitionId": "TypeSpec.string",
@@ -4055,11 +3446,11 @@
        "SkipUrlEncoding": false
       },
       {
-       "$id": "392",
+       "$id": "331",
        "Name": "body",
        "NameInRequest": "body",
        "Type": {
-        "$ref": "108"
+        "$ref": "90"
        },
        "Location": "Body",
        "IsApiVersion": false,
@@ -4074,12 +3465,12 @@
      ],
      "Responses": [
       {
-       "$id": "393",
+       "$id": "332",
        "StatusCodes": [
         200
        ],
        "BodyType": {
-        "$ref": "108"
+        "$ref": "90"
        },
        "BodyMediaType": "Json",
        "Headers": [],
@@ -4103,19 +3494,19 @@
      "Decorators": []
     },
     {
-     "$id": "394",
+     "$id": "333",
      "Name": "stillConvenient",
      "ResourceName": "BasicTypeSpec",
      "Description": "When set protocol false and convenient true, the convenient method should be generated even it has the same signature as protocol one",
      "Accessibility": "public",
      "Parameters": [
       {
-       "$ref": "254"
+       "$ref": "193"
       }
      ],
      "Responses": [
       {
-       "$id": "395",
+       "$id": "334",
        "StatusCodes": [
         204
        ],
@@ -4135,21 +3526,21 @@
      "Decorators": []
     },
     {
-     "$id": "396",
+     "$id": "335",
      "Name": "headAsBoolean",
      "ResourceName": "BasicTypeSpec",
      "Description": "head as boolean.",
      "Accessibility": "public",
      "Parameters": [
       {
-       "$ref": "254"
+       "$ref": "193"
       },
       {
-       "$id": "397",
+       "$id": "336",
        "Name": "id",
        "NameInRequest": "id",
        "Type": {
-        "$id": "398",
+        "$id": "337",
         "kind": "string",
         "name": "string",
         "crossLanguageDefinitionId": "TypeSpec.string",
@@ -4168,7 +3559,7 @@
      ],
      "Responses": [
       {
-       "$id": "399",
+       "$id": "338",
        "StatusCodes": [
         204
        ],
@@ -4189,20 +3580,20 @@
     }
    ],
    "Protocol": {
-    "$id": "400"
+    "$id": "339"
    },
    "Parameters": [
     {
-     "$ref": "254"
+     "$ref": "193"
     }
    ],
    "Decorators": []
   }
  ],
  "Auth": {
-  "$id": "401",
+  "$id": "340",
   "ApiKey": {
-   "$id": "402",
+   "$id": "341",
    "Name": "my-api-key"
   }
  }
diff --git a/eng/packages/http-client-csharp/package-lock.json b/eng/packages/http-client-csharp/package-lock.json
index a6c5127bbdfeb..407a1757603df 100644
--- a/eng/packages/http-client-csharp/package-lock.json
+++ b/eng/packages/http-client-csharp/package-lock.json
@@ -8,7 +8,7 @@
       "name": "@azure-typespec/http-client-csharp",
       "version": "1.0.0",
       "dependencies": {
-        "@typespec/http-client-csharp": "0.1.9-alpha.20240913.1"
+        "@typespec/http-client-csharp": "0.1.9-alpha.20241010.1"
       },
       "devDependencies": {
         "@eslint/js": "^9.2.0",
@@ -41,25 +41,23 @@
       }
     },
     "node_modules/@azure-tools/typespec-azure-core": {
-      "version": "0.45.0",
-      "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-core/-/typespec-azure-core-0.45.0.tgz",
-      "integrity": "sha512-GycGMCmaIVSN+TftPtlPJLyeOrglbLmH08ZiZaVMjSih/TQEJM21RGR6d8QdjlkQWN61ntNDRD+RP2uv9tHmqw==",
-      "license": "MIT",
+      "version": "0.47.0",
+      "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-core/-/typespec-azure-core-0.47.0.tgz",
+      "integrity": "sha512-RcBC5+dE1BVXTrUkkKULTImGxzM/ea3P3IL2kr9pk7r1uqF7D4CGqEKHFTg5L6QUtqc1f+zgTgQTNn6t4gI92w==",
       "peer": true,
       "engines": {
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@typespec/compiler": "~0.59.0",
-        "@typespec/http": "~0.59.0",
-        "@typespec/rest": "~0.59.0"
+        "@typespec/compiler": "~0.61.0",
+        "@typespec/http": "~0.61.0",
+        "@typespec/rest": "~0.61.0"
       }
     },
     "node_modules/@azure-tools/typespec-client-generator-core": {
-      "version": "0.45.3",
-      "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.45.3.tgz",
-      "integrity": "sha512-o1E38DJnJ71ixK3jHTy42QgY1ztXPGEOhJjdzSb9aI0aXlqqBt0Klgg52RuBHBajQ+RI+nWtGLE+LJaVDSHAqw==",
-      "license": "MIT",
+      "version": "0.47.1",
+      "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.47.1.tgz",
+      "integrity": "sha512-kgjGnnOaHewa8PjmZcEY4+UrEMBrXhOpMxDuhlMnFfOvCo3uZc3FVryoNrDHkZ8weCn6sjxo8zHcj1lpCg4/uw==",
       "peer": true,
       "dependencies": {
         "change-case": "~5.4.4",
@@ -69,19 +67,18 @@
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@azure-tools/typespec-azure-core": "~0.45.0",
-        "@typespec/compiler": "~0.59.0",
-        "@typespec/http": "~0.59.0",
-        "@typespec/openapi": "~0.59.0",
-        "@typespec/rest": "~0.59.0",
-        "@typespec/versioning": "~0.59.0"
+        "@azure-tools/typespec-azure-core": "~0.47.0",
+        "@typespec/compiler": "~0.61.0",
+        "@typespec/http": "~0.61.0",
+        "@typespec/openapi": "~0.61.0",
+        "@typespec/rest": "~0.61.0",
+        "@typespec/versioning": "~0.61.0"
       }
     },
     "node_modules/@babel/code-frame": {
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
       "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/highlight": "^7.24.7",
@@ -102,22 +99,20 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
-      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
-      "license": "MIT",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz",
+      "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
-      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
-      "license": "MIT",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz",
+      "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==",
       "peer": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.25.7",
         "chalk": "^2.4.2",
         "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
@@ -1144,7 +1139,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz",
       "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==",
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=18"
@@ -1432,10 +1426,9 @@
       }
     },
     "node_modules/@typespec/compiler": {
-      "version": "0.59.1",
-      "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-0.59.1.tgz",
-      "integrity": "sha512-O2ljgr6YoFaIH6a8lWc90/czdv4B2X6N9wz4WsnQnVvgO0Tj0s+3xkvp4Tv59RKMhT0f3fK6dL8oEGO32FYk1A==",
-      "license": "MIT",
+      "version": "0.61.0",
+      "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-0.61.0.tgz",
+      "integrity": "sha512-sVS8oa6aWAsb2Dy2c4HGn5VOxoYy05bveMn6GRnBA8ZP/wPD3nvJgqWy94AUPezofKoGOfg0Pp/BrrkVyDzCuw==",
       "peer": true,
       "dependencies": {
         "@babel/code-frame": "~7.24.7",
@@ -1443,14 +1436,14 @@
         "change-case": "~5.4.4",
         "globby": "~14.0.2",
         "mustache": "~4.2.0",
-        "picocolors": "~1.0.1",
+        "picocolors": "~1.1.0",
         "prettier": "~3.3.3",
         "prompts": "~2.4.2",
         "semver": "^7.6.3",
         "temporal-polyfill": "^0.2.5",
         "vscode-languageserver": "~9.0.1",
-        "vscode-languageserver-textdocument": "~1.0.11",
-        "yaml": "~2.4.5",
+        "vscode-languageserver-textdocument": "~1.0.12",
+        "yaml": "~2.5.1",
         "yargs": "~17.7.2"
       },
       "bin": {
@@ -1465,7 +1458,6 @@
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
       "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
-      "license": "MIT",
       "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
@@ -1478,74 +1470,76 @@
       }
     },
     "node_modules/@typespec/http": {
-      "version": "0.59.1",
-      "resolved": "https://registry.npmjs.org/@typespec/http/-/http-0.59.1.tgz",
-      "integrity": "sha512-Ai8oCAO+Bw1HMSZ9gOI5Od4fNn/ul4HrVtTB01xFuLK6FQj854pxhzao8ylPnr7gIRQ327FV12/QfXR87yCiYQ==",
-      "license": "MIT",
+      "version": "0.61.0",
+      "resolved": "https://registry.npmjs.org/@typespec/http/-/http-0.61.0.tgz",
+      "integrity": "sha512-7+AYHkzkc+p652GY9BcEbXY4OZa1fTr03MVmZeafvmbQbXfyzUU9eJld13M3v6NaUWqXWZ7nBNMISyKiXp/kSw==",
       "peer": true,
       "engines": {
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@typespec/compiler": "~0.59.0"
+        "@typespec/compiler": "~0.61.0",
+        "@typespec/streams": "~0.61.0"
+      },
+      "peerDependenciesMeta": {
+        "@typespec/streams": {
+          "optional": true
+        }
       }
     },
     "node_modules/@typespec/http-client-csharp": {
-      "version": "0.1.9-alpha.20240913.1",
-      "resolved": "https://registry.npmjs.org/@typespec/http-client-csharp/-/http-client-csharp-0.1.9-alpha.20240913.1.tgz",
-      "integrity": "sha512-VBBjSXpngPDQadC5QlIRBQMQCtyDqG423C+2Qh0p+eHKzugedc/MgGIP8hOj0MMuqpqWqYp4akiA5XHEhsUHRA==",
+      "version": "0.1.9-alpha.20241010.1",
+      "resolved": "https://registry.npmjs.org/@typespec/http-client-csharp/-/http-client-csharp-0.1.9-alpha.20241010.1.tgz",
+      "integrity": "sha512-gmVr7hG/PvQ0HsAqxB1bxfCiA9qR7pU22RVRDSCxbScRkyN0z8XBtEOxBGCX9y/ut3nMyNakxfK/FVG+I+WOyQ==",
       "dependencies": {
         "json-serialize-refs": "0.1.0-0"
       },
       "peerDependencies": {
-        "@azure-tools/typespec-azure-core": ">=0.44.0 <1.0.0 || ~0.45.0-0 || ~0.46.0-0",
-        "@azure-tools/typespec-client-generator-core": ">=0.44.0 <1.0.0 || ~0.45.0-0 || ~0.46.0-0",
-        "@typespec/compiler": ">=0.58.0 <1.0.0 || ~0.59.0-0 || ~0.60.0-0",
-        "@typespec/http": ">=0.58.0 <1.0.0 || ~0.59.0-0 || ~0.60.0-0",
-        "@typespec/openapi": ">=0.58.0 <1.0.0 || ~0.59.0-0 || ~0.60.0-0",
-        "@typespec/rest": ">=0.58.0 <1.0.0 || ~0.59.0-0 || ~0.60.0-0",
-        "@typespec/versioning": ">=0.58.0 <1.0.0 || ~0.59.0-0 || ~0.60.0-0"
+        "@azure-tools/typespec-azure-core": ">=0.46.0 <1.0.0 || ~0.47.0-0",
+        "@azure-tools/typespec-client-generator-core": ">=0.46.0 <1.0.0 || ~0.47.0-0",
+        "@typespec/compiler": ">=0.60.0 <1.0.0 || ~0.61.0-0",
+        "@typespec/http": ">=0.60.0 <1.0.0 || ~0.61.0-0",
+        "@typespec/openapi": ">=0.60.0 <1.0.0 || ~0.61.0-0",
+        "@typespec/rest": ">=0.60.0 <1.0.0 || ~0.61.0-0",
+        "@typespec/versioning": ">=0.60.0 <1.0.0 || ~0.61.0-0"
       }
     },
     "node_modules/@typespec/openapi": {
-      "version": "0.59.0",
-      "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-0.59.0.tgz",
-      "integrity": "sha512-do1Dm5w0MuK3994gYTBg6qMfgeIxmmsDqnz3zimYKMPpbnUBi4F6/o4iCfn0Fn9kaNl+H6UlOzZpsZW9xHui1Q==",
-      "license": "MIT",
+      "version": "0.61.0",
+      "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-0.61.0.tgz",
+      "integrity": "sha512-3AF319Ae4yGVOscsCLQeedXUJJcL/NdGOR2/e/nFiL/AOVdgLfIRnpR0Ad9Zj9XAESh1fq9XSu4Mi7N1k4V7rw==",
       "peer": true,
       "engines": {
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@typespec/compiler": "~0.59.0",
-        "@typespec/http": "~0.59.0"
+        "@typespec/compiler": "~0.61.0",
+        "@typespec/http": "~0.61.0"
       }
     },
     "node_modules/@typespec/rest": {
-      "version": "0.59.1",
-      "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.59.1.tgz",
-      "integrity": "sha512-uKU431jBYL2tVQWG5THA75+OtXDa1e8cMAafYK/JJRRiVRd8D/Epd8fp07dzlB8tFGrhCaGlekRMqFPFrHh2/A==",
-      "license": "MIT",
+      "version": "0.61.0",
+      "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.61.0.tgz",
+      "integrity": "sha512-L9Oyor+l42p6S8GE+UvaZTi+dcu6WubGZKmaBRpX8mCZGsa69EgIK8DQoyxrfMcxAO4I5U0sfkzCKwCVFtRr9g==",
       "peer": true,
       "engines": {
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@typespec/compiler": "~0.59.0",
-        "@typespec/http": "~0.59.1"
+        "@typespec/compiler": "~0.61.0",
+        "@typespec/http": "~0.61.0"
       }
     },
     "node_modules/@typespec/versioning": {
-      "version": "0.59.0",
-      "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.59.0.tgz",
-      "integrity": "sha512-aihO/ux0lLmsuYAdGVkiBflSudcZokYG42SELk1FtMFo609G3Pd7ep7hau6unBnMIceQZejB0ow5UGRupK4X5A==",
-      "license": "MIT",
+      "version": "0.61.0",
+      "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.61.0.tgz",
+      "integrity": "sha512-PIIug6eg3zc7E+BBHyNHHQD+OBq3FU465nhKrLEp35iVji/sYFuPc1ywnELDuwJVRWm6nvqNL1vtnc+4lEk+oA==",
       "peer": true,
       "engines": {
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@typespec/compiler": "~0.59.0"
+        "@typespec/compiler": "~0.61.0"
       }
     },
     "node_modules/@ungap/structured-clone": {
@@ -1748,7 +1742,6 @@
       "version": "8.17.1",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
@@ -1774,7 +1767,6 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "color-convert": "^1.9.0"
@@ -1909,7 +1901,6 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "ansi-styles": "^3.2.1",
@@ -1924,7 +1915,6 @@
       "version": "5.4.4",
       "resolved": "https://registry.npmjs.org/change-case/-/change-case-5.4.4.tgz",
       "integrity": "sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==",
-      "license": "MIT",
       "peer": true
     },
     "node_modules/check-error": {
@@ -1958,7 +1948,6 @@
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "color-name": "1.1.3"
@@ -1968,7 +1957,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "license": "MIT",
       "peer": true
     },
     "node_modules/concat-map": {
@@ -2224,7 +2212,6 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=0.8.0"
@@ -2587,10 +2574,9 @@
       "license": "MIT"
     },
     "node_modules/fast-uri": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz",
-      "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==",
-      "license": "MIT",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.2.tgz",
+      "integrity": "sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row==",
       "peer": true
     },
     "node_modules/fastq": {
@@ -2815,7 +2801,6 @@
       "version": "14.0.2",
       "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz",
       "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@sindresorhus/merge-streams": "^2.1.0",
@@ -2843,7 +2828,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=4"
@@ -3094,7 +3078,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "license": "MIT",
       "peer": true
     },
     "node_modules/js-yaml": {
@@ -3121,7 +3104,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "license": "MIT",
       "peer": true
     },
     "node_modules/json-serialize-refs": {
@@ -3151,7 +3133,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=6"
@@ -3378,7 +3359,6 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
       "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
-      "license": "MIT",
       "peer": true,
       "bin": {
         "mustache": "bin/mustache"
@@ -3597,7 +3577,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz",
       "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==",
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=12"
@@ -3624,10 +3603,9 @@
       }
     },
     "node_modules/picocolors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
-      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
-      "license": "ISC"
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
+      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw=="
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
@@ -3657,7 +3635,6 @@
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
       "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=4"
@@ -3757,7 +3734,6 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
       "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "kleur": "^3.0.3",
@@ -3830,7 +3806,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=0.10.0"
@@ -4059,14 +4034,12 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
       "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-      "license": "MIT",
       "peer": true
     },
     "node_modules/slash": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
       "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=14.16"
@@ -4212,7 +4185,6 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "has-flag": "^3.0.0"
@@ -4225,7 +4197,6 @@
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/temporal-polyfill/-/temporal-polyfill-0.2.5.tgz",
       "integrity": "sha512-ye47xp8Cb0nDguAhrrDS1JT1SzwEV9e26sSsrWzVu+yPZ7LzceEcH0i2gci9jWfOfSCCgM3Qv5nOYShVUUFUXA==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "temporal-spec": "^0.2.4"
@@ -4235,7 +4206,6 @@
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/temporal-spec/-/temporal-spec-0.2.4.tgz",
       "integrity": "sha512-lDMFv4nKQrSjlkHKAlHVqKrBG4DyFfa9F74cmBZ3Iy3ed8yvWnlWSIdi4IKfSqwmazAohBNwiN64qGx4y5Q3IQ==",
-      "license": "ISC",
       "peer": true
     },
     "node_modules/test-exclude": {
@@ -4464,7 +4434,6 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
       "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=18"
@@ -4668,7 +4637,6 @@
       "version": "8.2.0",
       "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz",
       "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==",
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=14.0.0"
@@ -4678,7 +4646,6 @@
       "version": "9.0.1",
       "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz",
       "integrity": "sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "vscode-languageserver-protocol": "3.17.5"
@@ -4691,7 +4658,6 @@
       "version": "3.17.5",
       "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz",
       "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==",
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "vscode-jsonrpc": "8.2.0",
@@ -4702,14 +4668,12 @@
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz",
       "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==",
-      "license": "MIT",
       "peer": true
     },
     "node_modules/vscode-languageserver-types": {
       "version": "3.17.5",
       "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz",
       "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==",
-      "license": "MIT",
       "peer": true
     },
     "node_modules/which": {
@@ -4887,10 +4851,9 @@
       }
     },
     "node_modules/yaml": {
-      "version": "2.4.5",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.5.tgz",
-      "integrity": "sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==",
-      "license": "ISC",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz",
+      "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==",
       "peer": true,
       "bin": {
         "yaml": "bin.mjs"
diff --git a/eng/packages/http-client-csharp/package.json b/eng/packages/http-client-csharp/package.json
index c5e11dfd0d359..9c5b926af9c2a 100644
--- a/eng/packages/http-client-csharp/package.json
+++ b/eng/packages/http-client-csharp/package.json
@@ -23,7 +23,7 @@
     "dist/**"
   ],
   "dependencies": {
-    "@typespec/http-client-csharp": "0.1.9-alpha.20240913.1"
+    "@typespec/http-client-csharp": "0.1.9-alpha.20241010.1"
   },
   "devDependencies": {
     "@eslint/js": "^9.2.0",

From c691a98f93bbf1d429049846aeba107cb12f770e Mon Sep 17 00:00:00 2001
From: Wei Hu <huwe@microsoft.com>
Date: Fri, 11 Oct 2024 17:01:44 +0800
Subject: [PATCH 2/7] add dependencies

---
 eng/packages/http-client-csharp/package.json | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/eng/packages/http-client-csharp/package.json b/eng/packages/http-client-csharp/package.json
index 9c5b926af9c2a..ae3938c657991 100644
--- a/eng/packages/http-client-csharp/package.json
+++ b/eng/packages/http-client-csharp/package.json
@@ -25,10 +25,26 @@
   "dependencies": {
     "@typespec/http-client-csharp": "0.1.9-alpha.20241010.1"
   },
+  "peerDependencies": {
+    "@azure-tools/typespec-azure-core": ">=0.46.0 <1.0.0 || ~0.47.0-0",
+    "@azure-tools/typespec-client-generator-core": ">=0.46.0 <1.0.0 || ~0.47.0-0",
+    "@typespec/compiler": ">=0.60.0 <1.0.0 || ~0.61.0-0",
+    "@typespec/http": ">=0.60.0 <1.0.0 || ~0.61.0-0",
+    "@typespec/openapi": ">=0.60.0 <1.0.0 || ~0.61.0-0",
+    "@typespec/rest": ">=0.60.0 <1.0.0 || ~0.61.0-0",
+    "@typespec/versioning": ">=0.60.0 <1.0.0 || ~0.61.0-0"
+  },
   "devDependencies": {
     "@eslint/js": "^9.2.0",
     "@types/node": "~18.13.0",
     "@types/prettier": "^2.6.3",
+    "@typespec/compiler": "0.60.0",
+    "@typespec/http": "0.60.0",
+    "@typespec/json-schema": "0.60.0",
+    "@typespec/library-linter": "0.60.0",
+    "@typespec/openapi": "0.60.0",
+    "@typespec/rest": "0.60.0",
+    "@typespec/versioning": "0.60.0",
     "@vitest/coverage-v8": "^1.4.0",
     "@vitest/ui": "^1.4.0",
     "c8": "^9.1.0",

From 03ef8ca85c09186e366a283ca0e0eb95d13e5b74 Mon Sep 17 00:00:00 2001
From: Wei Hu <huwe@microsoft.com>
Date: Sat, 12 Oct 2024 10:46:03 +0800
Subject: [PATCH 3/7] update lock file

---
 .../http-client-csharp/package-lock.json      | 173 ++++++++++--------
 1 file changed, 93 insertions(+), 80 deletions(-)

diff --git a/eng/packages/http-client-csharp/package-lock.json b/eng/packages/http-client-csharp/package-lock.json
index 407a1757603df..dfe7d89654f14 100644
--- a/eng/packages/http-client-csharp/package-lock.json
+++ b/eng/packages/http-client-csharp/package-lock.json
@@ -14,6 +14,13 @@
         "@eslint/js": "^9.2.0",
         "@types/node": "~18.13.0",
         "@types/prettier": "^2.6.3",
+        "@typespec/compiler": "0.60.0",
+        "@typespec/http": "0.60.0",
+        "@typespec/json-schema": "0.60.0",
+        "@typespec/library-linter": "0.60.0",
+        "@typespec/openapi": "0.60.0",
+        "@typespec/rest": "0.60.0",
+        "@typespec/versioning": "0.60.0",
         "@vitest/coverage-v8": "^1.4.0",
         "@vitest/ui": "^1.4.0",
         "c8": "^9.1.0",
@@ -24,6 +31,15 @@
         "typescript": "~5.4.3",
         "typescript-eslint": "^7.8.0",
         "vitest": "^1.4.0"
+      },
+      "peerDependencies": {
+        "@azure-tools/typespec-azure-core": ">=0.46.0 <1.0.0 || ~0.47.0-0",
+        "@azure-tools/typespec-client-generator-core": ">=0.46.0 <1.0.0 || ~0.47.0-0",
+        "@typespec/compiler": ">=0.60.0 <1.0.0 || ~0.61.0-0",
+        "@typespec/http": ">=0.60.0 <1.0.0 || ~0.61.0-0",
+        "@typespec/openapi": ">=0.60.0 <1.0.0 || ~0.61.0-0",
+        "@typespec/rest": ">=0.60.0 <1.0.0 || ~0.61.0-0",
+        "@typespec/versioning": ">=0.60.0 <1.0.0 || ~0.61.0-0"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -79,7 +95,6 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
       "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
-      "peer": true,
       "dependencies": {
         "@babel/highlight": "^7.24.7",
         "picocolors": "^1.0.0"
@@ -110,7 +125,6 @@
       "version": "7.25.7",
       "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz",
       "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==",
-      "peer": true,
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.25.7",
         "chalk": "^2.4.2",
@@ -1139,7 +1153,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz",
       "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==",
-      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -1426,24 +1439,24 @@
       }
     },
     "node_modules/@typespec/compiler": {
-      "version": "0.61.0",
-      "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-0.61.0.tgz",
-      "integrity": "sha512-sVS8oa6aWAsb2Dy2c4HGn5VOxoYy05bveMn6GRnBA8ZP/wPD3nvJgqWy94AUPezofKoGOfg0Pp/BrrkVyDzCuw==",
-      "peer": true,
+      "version": "0.60.0",
+      "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-0.60.0.tgz",
+      "integrity": "sha512-qAS99tJv6RvxSescfxRVal4QWSfdf3BzIOgE8+Az6emL68aTE/W8zQ0Ijpgmhax7sC2AnLTxCK1tM9kj1YguRw==",
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "~7.24.7",
         "ajv": "~8.17.1",
         "change-case": "~5.4.4",
         "globby": "~14.0.2",
         "mustache": "~4.2.0",
-        "picocolors": "~1.1.0",
+        "picocolors": "~1.0.1",
         "prettier": "~3.3.3",
         "prompts": "~2.4.2",
         "semver": "^7.6.3",
         "temporal-polyfill": "^0.2.5",
         "vscode-languageserver": "~9.0.1",
-        "vscode-languageserver-textdocument": "~1.0.12",
-        "yaml": "~2.5.1",
+        "vscode-languageserver-textdocument": "~1.0.11",
+        "yaml": "~2.4.5",
         "yargs": "~17.7.2"
       },
       "bin": {
@@ -1454,11 +1467,16 @@
         "node": ">=18.0.0"
       }
     },
+    "node_modules/@typespec/compiler/node_modules/picocolors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+      "license": "ISC"
+    },
     "node_modules/@typespec/compiler/node_modules/prettier": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
       "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
-      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -1470,21 +1488,15 @@
       }
     },
     "node_modules/@typespec/http": {
-      "version": "0.61.0",
-      "resolved": "https://registry.npmjs.org/@typespec/http/-/http-0.61.0.tgz",
-      "integrity": "sha512-7+AYHkzkc+p652GY9BcEbXY4OZa1fTr03MVmZeafvmbQbXfyzUU9eJld13M3v6NaUWqXWZ7nBNMISyKiXp/kSw==",
-      "peer": true,
+      "version": "0.60.0",
+      "resolved": "https://registry.npmjs.org/@typespec/http/-/http-0.60.0.tgz",
+      "integrity": "sha512-ktfS9vpHfltyeAaQLNAZdqrn6Per3vmB/HDH/iyudYLA5wWblT1siKvpFCMWq53CJorRO7yeOKv+Q/M26zwEtg==",
+      "license": "MIT",
       "engines": {
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@typespec/compiler": "~0.61.0",
-        "@typespec/streams": "~0.61.0"
-      },
-      "peerDependenciesMeta": {
-        "@typespec/streams": {
-          "optional": true
-        }
+        "@typespec/compiler": "~0.60.0"
       }
     },
     "node_modules/@typespec/http-client-csharp": {
@@ -1504,42 +1516,71 @@
         "@typespec/versioning": ">=0.60.0 <1.0.0 || ~0.61.0-0"
       }
     },
+    "node_modules/@typespec/json-schema": {
+      "version": "0.60.0",
+      "resolved": "https://registry.npmjs.org/@typespec/json-schema/-/json-schema-0.60.0.tgz",
+      "integrity": "sha512-TXtQH82CVtrDjiHjTCE/hHeizC/4DmvTFMmB/64cgC8QIp+C32tmyAv4/iXT6l8ovwB32btL9pAfczKiIxUIZw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "yaml": "~2.4.5"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "@typespec/compiler": "~0.60.0"
+      }
+    },
+    "node_modules/@typespec/library-linter": {
+      "version": "0.60.0",
+      "resolved": "https://registry.npmjs.org/@typespec/library-linter/-/library-linter-0.60.0.tgz",
+      "integrity": "sha512-PGcC+x7T/uq4KvbSm2uv/Eq7jZ6p1N0XynOjJZYx/+GjtB4M7mjAsmcQpuU7yKHfLJz3lfNmtXoAUgKKpC4FDw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "@typespec/compiler": "~0.60.0"
+      }
+    },
     "node_modules/@typespec/openapi": {
-      "version": "0.61.0",
-      "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-0.61.0.tgz",
-      "integrity": "sha512-3AF319Ae4yGVOscsCLQeedXUJJcL/NdGOR2/e/nFiL/AOVdgLfIRnpR0Ad9Zj9XAESh1fq9XSu4Mi7N1k4V7rw==",
-      "peer": true,
+      "version": "0.60.0",
+      "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-0.60.0.tgz",
+      "integrity": "sha512-YVwLppgHY8r/MudHNSLSUXzdw+CIpjmb31gI2a0KDGnI6sWDwY7LSWfjGU4TY/ubt0+X0Tjoy330mTvw71YBTg==",
+      "license": "MIT",
       "engines": {
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@typespec/compiler": "~0.61.0",
-        "@typespec/http": "~0.61.0"
+        "@typespec/compiler": "~0.60.0",
+        "@typespec/http": "~0.60.0"
       }
     },
     "node_modules/@typespec/rest": {
-      "version": "0.61.0",
-      "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.61.0.tgz",
-      "integrity": "sha512-L9Oyor+l42p6S8GE+UvaZTi+dcu6WubGZKmaBRpX8mCZGsa69EgIK8DQoyxrfMcxAO4I5U0sfkzCKwCVFtRr9g==",
-      "peer": true,
+      "version": "0.60.0",
+      "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.60.0.tgz",
+      "integrity": "sha512-mHYubyuBvwdV2xkHrJfPwV7b/Ksyb9lA1Q/AQwpVFa7Qu1X075TBVALmH+hK3V0EdUG1CGJZ5Sw4BWgl8ZS0BA==",
+      "license": "MIT",
       "engines": {
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@typespec/compiler": "~0.61.0",
-        "@typespec/http": "~0.61.0"
+        "@typespec/compiler": "~0.60.0",
+        "@typespec/http": "~0.60.0"
       }
     },
     "node_modules/@typespec/versioning": {
-      "version": "0.61.0",
-      "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.61.0.tgz",
-      "integrity": "sha512-PIIug6eg3zc7E+BBHyNHHQD+OBq3FU465nhKrLEp35iVji/sYFuPc1ywnELDuwJVRWm6nvqNL1vtnc+4lEk+oA==",
-      "peer": true,
+      "version": "0.60.0",
+      "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.60.0.tgz",
+      "integrity": "sha512-SqxCQ9qMw5fdR7WP6/GFLzwcFwxhv+uHlzJGVcTd1GtIAu5qj2X4VmzFuNQyu+QenI+5uOSrEEywEXn0YRTZSg==",
+      "license": "MIT",
       "engines": {
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@typespec/compiler": "~0.61.0"
+        "@typespec/compiler": "~0.60.0"
       }
     },
     "node_modules/@ungap/structured-clone": {
@@ -1742,7 +1783,6 @@
       "version": "8.17.1",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -1767,7 +1807,6 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "peer": true,
       "dependencies": {
         "color-convert": "^1.9.0"
       },
@@ -1901,7 +1940,6 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "peer": true,
       "dependencies": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -1914,8 +1952,7 @@
     "node_modules/change-case": {
       "version": "5.4.4",
       "resolved": "https://registry.npmjs.org/change-case/-/change-case-5.4.4.tgz",
-      "integrity": "sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==",
-      "peer": true
+      "integrity": "sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w=="
     },
     "node_modules/check-error": {
       "version": "1.0.3",
@@ -1948,7 +1985,6 @@
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "peer": true,
       "dependencies": {
         "color-name": "1.1.3"
       }
@@ -1956,8 +1992,7 @@
     "node_modules/color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "peer": true
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
@@ -2212,7 +2247,6 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "peer": true,
       "engines": {
         "node": ">=0.8.0"
       }
@@ -2576,8 +2610,7 @@
     "node_modules/fast-uri": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.2.tgz",
-      "integrity": "sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row==",
-      "peer": true
+      "integrity": "sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row=="
     },
     "node_modules/fastq": {
       "version": "1.17.1",
@@ -2801,7 +2834,6 @@
       "version": "14.0.2",
       "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz",
       "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==",
-      "peer": true,
       "dependencies": {
         "@sindresorhus/merge-streams": "^2.1.0",
         "fast-glob": "^3.3.2",
@@ -2828,7 +2860,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "peer": true,
       "engines": {
         "node": ">=4"
       }
@@ -3077,8 +3108,7 @@
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "peer": true
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
@@ -3103,8 +3133,7 @@
     "node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "peer": true
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
     "node_modules/json-serialize-refs": {
       "version": "0.1.0-0",
@@ -3133,7 +3162,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -3359,7 +3387,6 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
       "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
-      "peer": true,
       "bin": {
         "mustache": "bin/mustache"
       }
@@ -3577,7 +3604,6 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz",
       "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -3734,7 +3760,6 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
       "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-      "peer": true,
       "dependencies": {
         "kleur": "^3.0.3",
         "sisteransi": "^1.0.5"
@@ -3806,7 +3831,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4033,14 +4057,12 @@
     "node_modules/sisteransi": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-      "peer": true
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
     },
     "node_modules/slash": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
       "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
-      "peer": true,
       "engines": {
         "node": ">=14.16"
       },
@@ -4185,7 +4207,6 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "peer": true,
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -4197,7 +4218,6 @@
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/temporal-polyfill/-/temporal-polyfill-0.2.5.tgz",
       "integrity": "sha512-ye47xp8Cb0nDguAhrrDS1JT1SzwEV9e26sSsrWzVu+yPZ7LzceEcH0i2gci9jWfOfSCCgM3Qv5nOYShVUUFUXA==",
-      "peer": true,
       "dependencies": {
         "temporal-spec": "^0.2.4"
       }
@@ -4205,8 +4225,7 @@
     "node_modules/temporal-spec": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/temporal-spec/-/temporal-spec-0.2.4.tgz",
-      "integrity": "sha512-lDMFv4nKQrSjlkHKAlHVqKrBG4DyFfa9F74cmBZ3Iy3ed8yvWnlWSIdi4IKfSqwmazAohBNwiN64qGx4y5Q3IQ==",
-      "peer": true
+      "integrity": "sha512-lDMFv4nKQrSjlkHKAlHVqKrBG4DyFfa9F74cmBZ3Iy3ed8yvWnlWSIdi4IKfSqwmazAohBNwiN64qGx4y5Q3IQ=="
     },
     "node_modules/test-exclude": {
       "version": "6.0.0",
@@ -4434,7 +4453,6 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
       "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
-      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -4637,7 +4655,6 @@
       "version": "8.2.0",
       "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz",
       "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==",
-      "peer": true,
       "engines": {
         "node": ">=14.0.0"
       }
@@ -4646,7 +4663,6 @@
       "version": "9.0.1",
       "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz",
       "integrity": "sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==",
-      "peer": true,
       "dependencies": {
         "vscode-languageserver-protocol": "3.17.5"
       },
@@ -4658,7 +4674,6 @@
       "version": "3.17.5",
       "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz",
       "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==",
-      "peer": true,
       "dependencies": {
         "vscode-jsonrpc": "8.2.0",
         "vscode-languageserver-types": "3.17.5"
@@ -4667,14 +4682,12 @@
     "node_modules/vscode-languageserver-textdocument": {
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz",
-      "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==",
-      "peer": true
+      "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA=="
     },
     "node_modules/vscode-languageserver-types": {
       "version": "3.17.5",
       "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz",
-      "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==",
-      "peer": true
+      "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg=="
     },
     "node_modules/which": {
       "version": "2.0.2",
@@ -4851,10 +4864,10 @@
       }
     },
     "node_modules/yaml": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz",
-      "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==",
-      "peer": true,
+      "version": "2.4.5",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.5.tgz",
+      "integrity": "sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==",
+      "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"
       },

From 443bbe51639db834f23978a26e43a02215c0d01f Mon Sep 17 00:00:00 2001
From: Wei Hu <huwe@microsoft.com>
Date: Sat, 12 Oct 2024 13:57:58 +0800
Subject: [PATCH 4/7] fix dependencies

---
 .../http-client-csharp/package-lock.json      | 592 ++++++++++--------
 eng/packages/http-client-csharp/package.json  |  20 +-
 2 files changed, 319 insertions(+), 293 deletions(-)

diff --git a/eng/packages/http-client-csharp/package-lock.json b/eng/packages/http-client-csharp/package-lock.json
index dfe7d89654f14..f4961bcabc602 100644
--- a/eng/packages/http-client-csharp/package-lock.json
+++ b/eng/packages/http-client-csharp/package-lock.json
@@ -12,15 +12,8 @@
       },
       "devDependencies": {
         "@eslint/js": "^9.2.0",
-        "@types/node": "~18.13.0",
+        "@types/node": "~22.7.5",
         "@types/prettier": "^2.6.3",
-        "@typespec/compiler": "0.60.0",
-        "@typespec/http": "0.60.0",
-        "@typespec/json-schema": "0.60.0",
-        "@typespec/library-linter": "0.60.0",
-        "@typespec/openapi": "0.60.0",
-        "@typespec/rest": "0.60.0",
-        "@typespec/versioning": "0.60.0",
         "@vitest/coverage-v8": "^1.4.0",
         "@vitest/ui": "^1.4.0",
         "c8": "^9.1.0",
@@ -28,18 +21,9 @@
         "eslint": "^8.57.0",
         "prettier": "~3.0.3",
         "rimraf": "~5.0.5",
-        "typescript": "~5.4.3",
+        "typescript": "~5.6.3",
         "typescript-eslint": "^7.8.0",
         "vitest": "^1.4.0"
-      },
-      "peerDependencies": {
-        "@azure-tools/typespec-azure-core": ">=0.46.0 <1.0.0 || ~0.47.0-0",
-        "@azure-tools/typespec-client-generator-core": ">=0.46.0 <1.0.0 || ~0.47.0-0",
-        "@typespec/compiler": ">=0.60.0 <1.0.0 || ~0.61.0-0",
-        "@typespec/http": ">=0.60.0 <1.0.0 || ~0.61.0-0",
-        "@typespec/openapi": ">=0.60.0 <1.0.0 || ~0.61.0-0",
-        "@typespec/rest": ">=0.60.0 <1.0.0 || ~0.61.0-0",
-        "@typespec/versioning": ">=0.60.0 <1.0.0 || ~0.61.0-0"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -60,6 +44,7 @@
       "version": "0.47.0",
       "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-core/-/typespec-azure-core-0.47.0.tgz",
       "integrity": "sha512-RcBC5+dE1BVXTrUkkKULTImGxzM/ea3P3IL2kr9pk7r1uqF7D4CGqEKHFTg5L6QUtqc1f+zgTgQTNn6t4gI92w==",
+      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=18.0.0"
@@ -74,6 +59,7 @@
       "version": "0.47.1",
       "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.47.1.tgz",
       "integrity": "sha512-kgjGnnOaHewa8PjmZcEY4+UrEMBrXhOpMxDuhlMnFfOvCo3uZc3FVryoNrDHkZ8weCn6sjxo8zHcj1lpCg4/uw==",
+      "license": "MIT",
       "peer": true,
       "dependencies": {
         "change-case": "~5.4.4",
@@ -95,6 +81,8 @@
       "version": "7.24.7",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
       "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/highlight": "^7.24.7",
         "picocolors": "^1.0.0"
@@ -104,9 +92,9 @@
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
-      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz",
+      "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -117,6 +105,7 @@
       "version": "7.25.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz",
       "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -125,6 +114,8 @@
       "version": "7.25.7",
       "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz",
       "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.25.7",
         "chalk": "^2.4.2",
@@ -136,13 +127,13 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.25.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.3.tgz",
-      "integrity": "sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.8.tgz",
+      "integrity": "sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.2"
+        "@babel/types": "^7.25.8"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -152,14 +143,14 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.2.tgz",
-      "integrity": "sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==",
+      "version": "7.25.8",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.8.tgz",
+      "integrity": "sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.24.8",
-        "@babel/helper-validator-identifier": "^7.24.7",
+        "@babel/helper-string-parser": "^7.25.7",
+        "@babel/helper-validator-identifier": "^7.25.7",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -581,9 +572,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
-      "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
+      "version": "4.11.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.1.tgz",
+      "integrity": "sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -639,9 +630,9 @@
       "license": "MIT"
     },
     "node_modules/@eslint/js": {
-      "version": "9.9.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.9.0.tgz",
-      "integrity": "sha512-hhetes6ZHP3BlXLxmd8K2SNgkhNSi+UcecbnwWKwpP7kyi/uC75DJ1lOOBO3xrC4jyojtGE3YxKZPHfk4yrgug==",
+      "version": "9.12.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.12.0.tgz",
+      "integrity": "sha512-eohesHH8WFRUprDNyEREgqP6beG6htMeUYeCpkEgBCieCMme5r9zFWjzAJp//9S+Kub4rqE+jXe9Cp1a7IYIIA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -649,14 +640,14 @@
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
+      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
       "deprecated": "Use @eslint/config-array instead",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
+        "@humanwhocodes/object-schema": "^2.0.3",
         "debug": "^4.3.1",
         "minimatch": "^3.0.5"
       },
@@ -705,9 +696,9 @@
       }
     },
     "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -912,16 +903,16 @@
       }
     },
     "node_modules/@polka/url": {
-      "version": "1.0.0-next.25",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz",
-      "integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==",
+      "version": "1.0.0-next.28",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.28.tgz",
+      "integrity": "sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.0.tgz",
-      "integrity": "sha512-WTWD8PfoSAJ+qL87lE7votj3syLavxunWhzCnx3XFxFiI/BA/r3X7MUM8dVrH8rb2r4AiO8jJsr3ZjdaftmnfA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.0.tgz",
+      "integrity": "sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==",
       "cpu": [
         "arm"
       ],
@@ -933,9 +924,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.0.tgz",
-      "integrity": "sha512-a1sR2zSK1B4eYkiZu17ZUZhmUQcKjk2/j9Me2IDjk1GHW7LB5Z35LEzj9iJch6gtUfsnvZs1ZNyDW2oZSThrkA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.0.tgz",
+      "integrity": "sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==",
       "cpu": [
         "arm64"
       ],
@@ -947,9 +938,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.0.tgz",
-      "integrity": "sha512-zOnKWLgDld/svhKO5PD9ozmL6roy5OQ5T4ThvdYZLpiOhEGY+dp2NwUmxK0Ld91LrbjrvtNAE0ERBwjqhZTRAA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.0.tgz",
+      "integrity": "sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==",
       "cpu": [
         "arm64"
       ],
@@ -961,9 +952,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.0.tgz",
-      "integrity": "sha512-7doS8br0xAkg48SKE2QNtMSFPFUlRdw9+votl27MvT46vo44ATBmdZdGysOevNELmZlfd+NEa0UYOA8f01WSrg==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.0.tgz",
+      "integrity": "sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==",
       "cpu": [
         "x64"
       ],
@@ -975,9 +966,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.0.tgz",
-      "integrity": "sha512-pWJsfQjNWNGsoCq53KjMtwdJDmh/6NubwQcz52aEwLEuvx08bzcy6tOUuawAOncPnxz/3siRtd8hiQ32G1y8VA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.0.tgz",
+      "integrity": "sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==",
       "cpu": [
         "arm"
       ],
@@ -989,9 +980,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.0.tgz",
-      "integrity": "sha512-efRIANsz3UHZrnZXuEvxS9LoCOWMGD1rweciD6uJQIx2myN3a8Im1FafZBzh7zk1RJ6oKcR16dU3UPldaKd83w==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.0.tgz",
+      "integrity": "sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==",
       "cpu": [
         "arm"
       ],
@@ -1003,9 +994,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.0.tgz",
-      "integrity": "sha512-ZrPhydkTVhyeGTW94WJ8pnl1uroqVHM3j3hjdquwAcWnmivjAwOYjTEAuEDeJvGX7xv3Z9GAvrBkEzCgHq9U1w==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.0.tgz",
+      "integrity": "sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==",
       "cpu": [
         "arm64"
       ],
@@ -1017,9 +1008,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.0.tgz",
-      "integrity": "sha512-cfaupqd+UEFeURmqNP2eEvXqgbSox/LHOyN9/d2pSdV8xTrjdg3NgOFJCtc1vQ/jEke1qD0IejbBfxleBPHnPw==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.0.tgz",
+      "integrity": "sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==",
       "cpu": [
         "arm64"
       ],
@@ -1031,9 +1022,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.0.tgz",
-      "integrity": "sha512-ZKPan1/RvAhrUylwBXC9t7B2hXdpb/ufeu22pG2psV7RN8roOfGurEghw1ySmX/CmDDHNTDDjY3lo9hRlgtaHg==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.0.tgz",
+      "integrity": "sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==",
       "cpu": [
         "ppc64"
       ],
@@ -1045,9 +1036,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.0.tgz",
-      "integrity": "sha512-H1eRaCwd5E8eS8leiS+o/NqMdljkcb1d6r2h4fKSsCXQilLKArq6WS7XBLDu80Yz+nMqHVFDquwcVrQmGr28rg==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.0.tgz",
+      "integrity": "sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==",
       "cpu": [
         "riscv64"
       ],
@@ -1059,9 +1050,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.0.tgz",
-      "integrity": "sha512-zJ4hA+3b5tu8u7L58CCSI0A9N1vkfwPhWd/puGXwtZlsB5bTkwDNW/+JCU84+3QYmKpLi+XvHdmrlwUwDA6kqw==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.0.tgz",
+      "integrity": "sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==",
       "cpu": [
         "s390x"
       ],
@@ -1073,9 +1064,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.0.tgz",
-      "integrity": "sha512-e2hrvElFIh6kW/UNBQK/kzqMNY5mO+67YtEh9OA65RM5IJXYTWiXjX6fjIiPaqOkBthYF1EqgiZ6OXKcQsM0hg==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.0.tgz",
+      "integrity": "sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==",
       "cpu": [
         "x64"
       ],
@@ -1087,9 +1078,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.0.tgz",
-      "integrity": "sha512-1vvmgDdUSebVGXWX2lIcgRebqfQSff0hMEkLJyakQ9JQUbLDkEaMsPTLOmyccyC6IJ/l3FZuJbmrBw/u0A0uCQ==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.0.tgz",
+      "integrity": "sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==",
       "cpu": [
         "x64"
       ],
@@ -1101,9 +1092,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.0.tgz",
-      "integrity": "sha512-s5oFkZ/hFcrlAyBTONFY1TWndfyre1wOMwU+6KCpm/iatybvrRgmZVM+vCFwxmC5ZhdlgfE0N4XorsDpi7/4XQ==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.0.tgz",
+      "integrity": "sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==",
       "cpu": [
         "arm64"
       ],
@@ -1115,9 +1106,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.0.tgz",
-      "integrity": "sha512-G9+TEqRnAA6nbpqyUqgTiopmnfgnMkR3kMukFBDsiyy23LZvUCpiUwjTRx6ezYCjJODXrh52rBR9oXvm+Fp5wg==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.0.tgz",
+      "integrity": "sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==",
       "cpu": [
         "ia32"
       ],
@@ -1129,9 +1120,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.0.tgz",
-      "integrity": "sha512-2jsCDZwtQvRhejHLfZ1JY6w6kEuEtfF9nzYsZxzSlNVKDX+DpsDJ+Rbjkm74nvg2rdx0gwBS+IMdvwJuq3S9pQ==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.0.tgz",
+      "integrity": "sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==",
       "cpu": [
         "x64"
       ],
@@ -1153,6 +1144,8 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz",
       "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==",
+      "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -1161,9 +1154,9 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
       "dev": true,
       "license": "MIT"
     },
@@ -1175,11 +1168,14 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "18.13.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.13.0.tgz",
-      "integrity": "sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==",
+      "version": "22.7.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
+      "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.19.2"
+      }
     },
     "node_modules/@types/prettier": {
       "version": "2.7.3",
@@ -1439,24 +1435,25 @@
       }
     },
     "node_modules/@typespec/compiler": {
-      "version": "0.60.0",
-      "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-0.60.0.tgz",
-      "integrity": "sha512-qAS99tJv6RvxSescfxRVal4QWSfdf3BzIOgE8+Az6emL68aTE/W8zQ0Ijpgmhax7sC2AnLTxCK1tM9kj1YguRw==",
+      "version": "0.61.2",
+      "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-0.61.2.tgz",
+      "integrity": "sha512-6QxYJd09VWssd/BvY+8eBxTVv085s1UNK63FdPrgT2lgI+j8VMMcpNR9m5l1zWlgGDM7sniA/Or8VCdVA6jerg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/code-frame": "~7.24.7",
         "ajv": "~8.17.1",
         "change-case": "~5.4.4",
         "globby": "~14.0.2",
         "mustache": "~4.2.0",
-        "picocolors": "~1.0.1",
+        "picocolors": "~1.1.0",
         "prettier": "~3.3.3",
         "prompts": "~2.4.2",
         "semver": "^7.6.3",
         "temporal-polyfill": "^0.2.5",
         "vscode-languageserver": "~9.0.1",
-        "vscode-languageserver-textdocument": "~1.0.11",
-        "yaml": "~2.4.5",
+        "vscode-languageserver-textdocument": "~1.0.12",
+        "yaml": "~2.5.1",
         "yargs": "~17.7.2"
       },
       "bin": {
@@ -1467,16 +1464,12 @@
         "node": ">=18.0.0"
       }
     },
-    "node_modules/@typespec/compiler/node_modules/picocolors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
-      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
-      "license": "ISC"
-    },
     "node_modules/@typespec/compiler/node_modules/prettier": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
       "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
+      "license": "MIT",
+      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -1488,21 +1481,29 @@
       }
     },
     "node_modules/@typespec/http": {
-      "version": "0.60.0",
-      "resolved": "https://registry.npmjs.org/@typespec/http/-/http-0.60.0.tgz",
-      "integrity": "sha512-ktfS9vpHfltyeAaQLNAZdqrn6Per3vmB/HDH/iyudYLA5wWblT1siKvpFCMWq53CJorRO7yeOKv+Q/M26zwEtg==",
+      "version": "0.61.0",
+      "resolved": "https://registry.npmjs.org/@typespec/http/-/http-0.61.0.tgz",
+      "integrity": "sha512-7+AYHkzkc+p652GY9BcEbXY4OZa1fTr03MVmZeafvmbQbXfyzUU9eJld13M3v6NaUWqXWZ7nBNMISyKiXp/kSw==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@typespec/compiler": "~0.60.0"
+        "@typespec/compiler": "~0.61.0",
+        "@typespec/streams": "~0.61.0"
+      },
+      "peerDependenciesMeta": {
+        "@typespec/streams": {
+          "optional": true
+        }
       }
     },
     "node_modules/@typespec/http-client-csharp": {
       "version": "0.1.9-alpha.20241010.1",
       "resolved": "https://registry.npmjs.org/@typespec/http-client-csharp/-/http-client-csharp-0.1.9-alpha.20241010.1.tgz",
       "integrity": "sha512-gmVr7hG/PvQ0HsAqxB1bxfCiA9qR7pU22RVRDSCxbScRkyN0z8XBtEOxBGCX9y/ut3nMyNakxfK/FVG+I+WOyQ==",
+      "license": "MIT",
       "dependencies": {
         "json-serialize-refs": "0.1.0-0"
       },
@@ -1516,71 +1517,45 @@
         "@typespec/versioning": ">=0.60.0 <1.0.0 || ~0.61.0-0"
       }
     },
-    "node_modules/@typespec/json-schema": {
-      "version": "0.60.0",
-      "resolved": "https://registry.npmjs.org/@typespec/json-schema/-/json-schema-0.60.0.tgz",
-      "integrity": "sha512-TXtQH82CVtrDjiHjTCE/hHeizC/4DmvTFMmB/64cgC8QIp+C32tmyAv4/iXT6l8ovwB32btL9pAfczKiIxUIZw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "yaml": "~2.4.5"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      },
-      "peerDependencies": {
-        "@typespec/compiler": "~0.60.0"
-      }
-    },
-    "node_modules/@typespec/library-linter": {
-      "version": "0.60.0",
-      "resolved": "https://registry.npmjs.org/@typespec/library-linter/-/library-linter-0.60.0.tgz",
-      "integrity": "sha512-PGcC+x7T/uq4KvbSm2uv/Eq7jZ6p1N0XynOjJZYx/+GjtB4M7mjAsmcQpuU7yKHfLJz3lfNmtXoAUgKKpC4FDw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "peerDependencies": {
-        "@typespec/compiler": "~0.60.0"
-      }
-    },
     "node_modules/@typespec/openapi": {
-      "version": "0.60.0",
-      "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-0.60.0.tgz",
-      "integrity": "sha512-YVwLppgHY8r/MudHNSLSUXzdw+CIpjmb31gI2a0KDGnI6sWDwY7LSWfjGU4TY/ubt0+X0Tjoy330mTvw71YBTg==",
+      "version": "0.61.0",
+      "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-0.61.0.tgz",
+      "integrity": "sha512-3AF319Ae4yGVOscsCLQeedXUJJcL/NdGOR2/e/nFiL/AOVdgLfIRnpR0Ad9Zj9XAESh1fq9XSu4Mi7N1k4V7rw==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@typespec/compiler": "~0.60.0",
-        "@typespec/http": "~0.60.0"
+        "@typespec/compiler": "~0.61.0",
+        "@typespec/http": "~0.61.0"
       }
     },
     "node_modules/@typespec/rest": {
-      "version": "0.60.0",
-      "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.60.0.tgz",
-      "integrity": "sha512-mHYubyuBvwdV2xkHrJfPwV7b/Ksyb9lA1Q/AQwpVFa7Qu1X075TBVALmH+hK3V0EdUG1CGJZ5Sw4BWgl8ZS0BA==",
+      "version": "0.61.0",
+      "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.61.0.tgz",
+      "integrity": "sha512-L9Oyor+l42p6S8GE+UvaZTi+dcu6WubGZKmaBRpX8mCZGsa69EgIK8DQoyxrfMcxAO4I5U0sfkzCKwCVFtRr9g==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@typespec/compiler": "~0.60.0",
-        "@typespec/http": "~0.60.0"
+        "@typespec/compiler": "~0.61.0",
+        "@typespec/http": "~0.61.0"
       }
     },
     "node_modules/@typespec/versioning": {
-      "version": "0.60.0",
-      "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.60.0.tgz",
-      "integrity": "sha512-SqxCQ9qMw5fdR7WP6/GFLzwcFwxhv+uHlzJGVcTd1GtIAu5qj2X4VmzFuNQyu+QenI+5uOSrEEywEXn0YRTZSg==",
+      "version": "0.61.0",
+      "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.61.0.tgz",
+      "integrity": "sha512-PIIug6eg3zc7E+BBHyNHHQD+OBq3FU465nhKrLEp35iVji/sYFuPc1ywnELDuwJVRWm6nvqNL1vtnc+4lEk+oA==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@typespec/compiler": "~0.60.0"
+        "@typespec/compiler": "~0.61.0"
       }
     },
     "node_modules/@ungap/structured-clone": {
@@ -1767,9 +1742,9 @@
       }
     },
     "node_modules/acorn-walk": {
-      "version": "8.3.3",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz",
-      "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==",
+      "version": "8.3.4",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
+      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1783,6 +1758,8 @@
       "version": "8.17.1",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -1807,6 +1784,8 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "color-convert": "^1.9.0"
       },
@@ -1940,6 +1919,8 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -1952,7 +1933,9 @@
     "node_modules/change-case": {
       "version": "5.4.4",
       "resolved": "https://registry.npmjs.org/change-case/-/change-case-5.4.4.tgz",
-      "integrity": "sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w=="
+      "integrity": "sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==",
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/check-error": {
       "version": "1.0.3",
@@ -1985,6 +1968,8 @@
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "color-name": "1.1.3"
       }
@@ -1992,7 +1977,9 @@
     "node_modules/color-name": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
@@ -2002,9 +1989,9 @@
       "license": "MIT"
     },
     "node_modules/confbox": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.7.tgz",
-      "integrity": "sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA==",
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz",
+      "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==",
       "dev": true,
       "license": "MIT"
     },
@@ -2099,13 +2086,13 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
-      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -2235,9 +2222,9 @@
       }
     },
     "node_modules/escalade": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -2247,22 +2234,25 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.8.0"
       }
     },
     "node_modules/eslint": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
-      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
+      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
+      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.57.0",
-        "@humanwhocodes/config-array": "^0.11.14",
+        "@eslint/js": "8.57.1",
+        "@humanwhocodes/config-array": "^0.13.0",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "@ungap/structured-clone": "^1.2.0",
@@ -2338,9 +2328,9 @@
       }
     },
     "node_modules/eslint/node_modules/@eslint/js": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
-      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
+      "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2430,19 +2420,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^4.0.3"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
     "node_modules/eslint/node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -2593,6 +2570,18 @@
         "node": ">=8.6.0"
       }
     },
+    "node_modules/fast-glob/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "license": "ISC",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
@@ -2610,7 +2599,9 @@
     "node_modules/fast-uri": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.2.tgz",
-      "integrity": "sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row=="
+      "integrity": "sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row==",
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/fastq": {
       "version": "1.17.1",
@@ -2803,15 +2794,16 @@
       }
     },
     "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
-        "is-glob": "^4.0.1"
+        "is-glob": "^4.0.3"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=10.13.0"
       }
     },
     "node_modules/globals": {
@@ -2834,6 +2826,8 @@
       "version": "14.0.2",
       "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz",
       "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@sindresorhus/merge-streams": "^2.1.0",
         "fast-glob": "^3.3.2",
@@ -2860,6 +2854,8 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=4"
       }
@@ -3108,7 +3104,9 @@
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
@@ -3133,7 +3131,9 @@
     "node_modules/json-schema-traverse": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/json-serialize-refs": {
       "version": "0.1.0-0",
@@ -3162,6 +3162,8 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -3238,9 +3240,9 @@
       "license": "ISC"
     },
     "node_modules/magic-string": {
-      "version": "0.30.11",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
-      "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
+      "version": "0.30.12",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.12.tgz",
+      "integrity": "sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3248,14 +3250,14 @@
       }
     },
     "node_modules/magicast": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.3.4.tgz",
-      "integrity": "sha512-TyDF/Pn36bBji9rWKHlZe+PZb6Mx5V8IHCSxk7X4aljM4e/vyDvZZYwHewdVaqiA0nb3ghfHU/6AUpDxWoER2Q==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.3.5.tgz",
+      "integrity": "sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.24.4",
-        "@babel/types": "^7.24.0",
+        "@babel/parser": "^7.25.4",
+        "@babel/types": "^7.25.4",
         "source-map-js": "^1.2.0"
       }
     },
@@ -3292,9 +3294,9 @@
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
-      "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
@@ -3354,16 +3356,16 @@
       }
     },
     "node_modules/mlly": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.1.tgz",
-      "integrity": "sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.2.tgz",
+      "integrity": "sha512-tN3dvVHYVz4DhSXinXIk7u9syPYaJvio118uomkovAtWBT+RdbP6Lfh/5Lvo519YMmwBafwlh20IPTXIStscpA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "acorn": "^8.11.3",
+        "acorn": "^8.12.1",
         "pathe": "^1.1.2",
-        "pkg-types": "^1.1.1",
-        "ufo": "^1.5.3"
+        "pkg-types": "^1.2.0",
+        "ufo": "^1.5.4"
       }
     },
     "node_modules/mrmime": {
@@ -3377,9 +3379,9 @@
       }
     },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true,
       "license": "MIT"
     },
@@ -3387,6 +3389,8 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
       "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
+      "license": "MIT",
+      "peer": true,
       "bin": {
         "mustache": "bin/mustache"
       }
@@ -3534,9 +3538,9 @@
       }
     },
     "node_modules/package-json-from-dist": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
-      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
       "dev": true,
       "license": "BlueOak-1.0.0"
     },
@@ -3604,6 +3608,8 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz",
       "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==",
+      "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -3631,7 +3637,8 @@
     "node_modules/picocolors": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
-      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw=="
+      "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
+      "license": "ISC"
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
@@ -3646,14 +3653,14 @@
       }
     },
     "node_modules/pkg-types": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.1.3.tgz",
-      "integrity": "sha512-+JrgthZG6m3ckicaOB74TwQ+tBWsFl3qVQg7mN8ulwSOElJ7gBhKzj2VkCPnZ4NlF6kEquYU+RIYNVAvzd54UA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.2.1.tgz",
+      "integrity": "sha512-sQoqa8alT3nHjGuTjuKgOnvjo4cljkufdtLMnO2LBP/wRwuDlo1tkaEdMxCRhyGRPacv/ztlZgDPm2b7FAmEvw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "confbox": "^0.1.7",
-        "mlly": "^1.7.1",
+        "confbox": "^0.1.8",
+        "mlly": "^1.7.2",
         "pathe": "^1.1.2"
       }
     },
@@ -3661,15 +3668,16 @@
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
       "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
+      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.41",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz",
-      "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==",
+      "version": "8.4.47",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
+      "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
       "dev": true,
       "funding": [
         {
@@ -3688,8 +3696,8 @@
       "license": "MIT",
       "dependencies": {
         "nanoid": "^3.3.7",
-        "picocolors": "^1.0.1",
-        "source-map-js": "^1.2.0"
+        "picocolors": "^1.1.0",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -3760,6 +3768,8 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
       "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "kleur": "^3.0.3",
         "sisteransi": "^1.0.5"
@@ -3831,6 +3841,8 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3919,13 +3931,13 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.21.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.0.tgz",
-      "integrity": "sha512-vo+S/lfA2lMS7rZ2Qoubi6I5hwZwzXeUIctILZLbHI+laNtvhhOIon2S1JksA5UEDQ7l3vberd0fxK44lTYjbQ==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.0.tgz",
+      "integrity": "sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.5"
+        "@types/estree": "1.0.6"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -3935,22 +3947,22 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.21.0",
-        "@rollup/rollup-android-arm64": "4.21.0",
-        "@rollup/rollup-darwin-arm64": "4.21.0",
-        "@rollup/rollup-darwin-x64": "4.21.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.21.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.21.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.21.0",
-        "@rollup/rollup-linux-arm64-musl": "4.21.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.21.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.21.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.21.0",
-        "@rollup/rollup-linux-x64-gnu": "4.21.0",
-        "@rollup/rollup-linux-x64-musl": "4.21.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.21.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.21.0",
-        "@rollup/rollup-win32-x64-msvc": "4.21.0",
+        "@rollup/rollup-android-arm-eabi": "4.24.0",
+        "@rollup/rollup-android-arm64": "4.24.0",
+        "@rollup/rollup-darwin-arm64": "4.24.0",
+        "@rollup/rollup-darwin-x64": "4.24.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.24.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.24.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.24.0",
+        "@rollup/rollup-linux-arm64-musl": "4.24.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.24.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.24.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.24.0",
+        "@rollup/rollup-linux-x64-gnu": "4.24.0",
+        "@rollup/rollup-linux-x64-musl": "4.24.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.24.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.24.0",
+        "@rollup/rollup-win32-x64-msvc": "4.24.0",
         "fsevents": "~2.3.2"
       }
     },
@@ -4057,12 +4069,16 @@
     "node_modules/sisteransi": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/slash": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
       "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
+      "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=14.16"
       },
@@ -4071,9 +4087,9 @@
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
-      "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
@@ -4207,6 +4223,8 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -4218,6 +4236,8 @@
       "version": "0.2.5",
       "resolved": "https://registry.npmjs.org/temporal-polyfill/-/temporal-polyfill-0.2.5.tgz",
       "integrity": "sha512-ye47xp8Cb0nDguAhrrDS1JT1SzwEV9e26sSsrWzVu+yPZ7LzceEcH0i2gci9jWfOfSCCgM3Qv5nOYShVUUFUXA==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "temporal-spec": "^0.2.4"
       }
@@ -4225,7 +4245,9 @@
     "node_modules/temporal-spec": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/temporal-spec/-/temporal-spec-0.2.4.tgz",
-      "integrity": "sha512-lDMFv4nKQrSjlkHKAlHVqKrBG4DyFfa9F74cmBZ3Iy3ed8yvWnlWSIdi4IKfSqwmazAohBNwiN64qGx4y5Q3IQ=="
+      "integrity": "sha512-lDMFv4nKQrSjlkHKAlHVqKrBG4DyFfa9F74cmBZ3Iy3ed8yvWnlWSIdi4IKfSqwmazAohBNwiN64qGx4y5Q3IQ==",
+      "license": "ISC",
+      "peer": true
     },
     "node_modules/test-exclude": {
       "version": "6.0.0",
@@ -4402,9 +4424,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
-      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
+      "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -4449,10 +4471,19 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/undici-types": {
+      "version": "6.19.8",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/unicorn-magic": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
       "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
+      "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -4503,14 +4534,14 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.4.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.2.tgz",
-      "integrity": "sha512-dDrQTRHp5C1fTFzcSaMxjk6vdpKvT+2/mIdE07Gw2ykehT49O0z/VHS3zZ8iV/Gh8BJJKHWOe5RjaNrW5xf/GA==",
+      "version": "5.4.8",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.8.tgz",
+      "integrity": "sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "esbuild": "^0.21.3",
-        "postcss": "^8.4.41",
+        "postcss": "^8.4.43",
         "rollup": "^4.20.0"
       },
       "bin": {
@@ -4655,6 +4686,8 @@
       "version": "8.2.0",
       "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz",
       "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==",
+      "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=14.0.0"
       }
@@ -4663,6 +4696,8 @@
       "version": "9.0.1",
       "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz",
       "integrity": "sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "vscode-languageserver-protocol": "3.17.5"
       },
@@ -4674,6 +4709,8 @@
       "version": "3.17.5",
       "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz",
       "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "vscode-jsonrpc": "8.2.0",
         "vscode-languageserver-types": "3.17.5"
@@ -4682,12 +4719,16 @@
     "node_modules/vscode-languageserver-textdocument": {
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz",
-      "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA=="
+      "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==",
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/vscode-languageserver-types": {
       "version": "3.17.5",
       "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz",
-      "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg=="
+      "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==",
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/which": {
       "version": "2.0.2",
@@ -4864,10 +4905,11 @@
       }
     },
     "node_modules/yaml": {
-      "version": "2.4.5",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.5.tgz",
-      "integrity": "sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz",
+      "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==",
       "license": "ISC",
+      "peer": true,
       "bin": {
         "yaml": "bin.mjs"
       },
diff --git a/eng/packages/http-client-csharp/package.json b/eng/packages/http-client-csharp/package.json
index ae3938c657991..31b5d4b9ed576 100644
--- a/eng/packages/http-client-csharp/package.json
+++ b/eng/packages/http-client-csharp/package.json
@@ -25,31 +25,15 @@
   "dependencies": {
     "@typespec/http-client-csharp": "0.1.9-alpha.20241010.1"
   },
-  "peerDependencies": {
-    "@azure-tools/typespec-azure-core": ">=0.46.0 <1.0.0 || ~0.47.0-0",
-    "@azure-tools/typespec-client-generator-core": ">=0.46.0 <1.0.0 || ~0.47.0-0",
-    "@typespec/compiler": ">=0.60.0 <1.0.0 || ~0.61.0-0",
-    "@typespec/http": ">=0.60.0 <1.0.0 || ~0.61.0-0",
-    "@typespec/openapi": ">=0.60.0 <1.0.0 || ~0.61.0-0",
-    "@typespec/rest": ">=0.60.0 <1.0.0 || ~0.61.0-0",
-    "@typespec/versioning": ">=0.60.0 <1.0.0 || ~0.61.0-0"
-  },
   "devDependencies": {
     "@eslint/js": "^9.2.0",
-    "@types/node": "~18.13.0",
+    "@types/node": "~22.7.5",
     "@types/prettier": "^2.6.3",
-    "@typespec/compiler": "0.60.0",
-    "@typespec/http": "0.60.0",
-    "@typespec/json-schema": "0.60.0",
-    "@typespec/library-linter": "0.60.0",
-    "@typespec/openapi": "0.60.0",
-    "@typespec/rest": "0.60.0",
-    "@typespec/versioning": "0.60.0",
     "@vitest/coverage-v8": "^1.4.0",
     "@vitest/ui": "^1.4.0",
     "c8": "^9.1.0",
     "rimraf": "~5.0.5",
-    "typescript": "~5.4.3",
+    "typescript": "~5.6.3",
     "vitest": "^1.4.0",
     "copyfiles": "^2.4.1",
     "eslint": "^8.57.0",

From c741f1e69f8651633fd00c2f1ae297dc50e02499 Mon Sep 17 00:00:00 2001
From: Wei Hu <huwe@microsoft.com>
Date: Sat, 12 Oct 2024 14:07:39 +0800
Subject: [PATCH 5/7] update test

---
 .../Local/Basic-TypeSpec/tspCodeModel.json     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/tspCodeModel.json
index f38a2f3ce37be..3ae6e337dd17e 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/tspCodeModel.json
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/tspCodeModel.json
@@ -36,7 +36,7 @@
    "description": "The Thing_requiredLiteralString",
    "isFixed": false,
    "isFlags": false,
-   "usage": "Input,Output,Json",
+   "usage": "Input,Output,Spread,Json",
    "decorators": []
   },
   {
@@ -69,7 +69,7 @@
    "description": "The Thing_requiredLiteralInt",
    "isFixed": false,
    "isFlags": false,
-   "usage": "Input,Output,Json",
+   "usage": "Input,Output,Spread,Json",
    "decorators": []
   },
   {
@@ -102,7 +102,7 @@
    "description": "The Thing_requiredLiteralFloat",
    "isFixed": false,
    "isFlags": false,
-   "usage": "Input,Output,Json",
+   "usage": "Input,Output,Spread,Json",
    "decorators": []
   },
   {
@@ -135,7 +135,7 @@
    "description": "The Thing_optionalLiteralString",
    "isFixed": false,
    "isFlags": false,
-   "usage": "Input,Output,Json",
+   "usage": "Input,Output,Spread,Json",
    "decorators": []
   },
   {
@@ -168,7 +168,7 @@
    "description": "The Thing_optionalLiteralInt",
    "isFixed": false,
    "isFlags": false,
-   "usage": "Input,Output,Json",
+   "usage": "Input,Output,Spread,Json",
    "decorators": []
   },
   {
@@ -201,7 +201,7 @@
    "description": "The Thing_optionalLiteralFloat",
    "isFixed": false,
    "isFlags": false,
-   "usage": "Input,Output,Json",
+   "usage": "Input,Output,Spread,Json",
    "decorators": []
   },
   {
@@ -824,7 +824,7 @@
    "kind": "model",
    "name": "Thing",
    "crossLanguageDefinitionId": "BasicTypeSpec.Thing",
-   "usage": "Input,Output,Json",
+   "usage": "Input,Output,Spread,Json",
    "decorators": [],
    "properties": [
     {
@@ -1729,7 +1729,7 @@
    "kind": "model",
    "name": "Friend",
    "crossLanguageDefinitionId": "BasicTypeSpec.NotFriend",
-   "usage": "Spread,Json",
+   "usage": "Output,Spread,Json",
    "decorators": [],
    "properties": [
     {
@@ -1758,7 +1758,7 @@
    "kind": "model",
    "name": "ProjectedModel",
    "crossLanguageDefinitionId": "BasicTypeSpec.ModelWithProjectedName",
-   "usage": "Spread,Json",
+   "usage": "Output,Spread,Json",
    "decorators": [],
    "properties": [
     {

From e8e9ad009a7d82f9560a9d5a6d84e2b7c61edad6 Mon Sep 17 00:00:00 2001
From: Wei Hu <huwe@microsoft.com>
Date: Sat, 12 Oct 2024 15:43:12 +0800
Subject: [PATCH 6/7] remove additional namespace

---
 .../Azure.Generator/src/AzureClientPlugin.cs  |   1 +
 .../BasicTypeSpecClient.RestClient.cs         | 122 ++---
 .../src/Generated/BasicTypeSpecClient.cs      | 516 +++++++++---------
 .../Generated/BasicTypeSpecClientOptions.cs   |   2 +-
 .../Generated/BasicTypeSpecModelFactory.cs    |  12 +-
 .../Internal/ClientPipelineExtensions.cs      |  36 +-
 .../Generated/Internal/ClientUriBuilder.cs    |  14 +-
 .../src/Generated/Internal/ErrorResult.cs     |   8 +-
 .../Internal/ModelSerializationExtensions.cs  |  62 +--
 .../src/Generated/Internal/Optional.cs        |   4 +-
 .../src/Generated/Internal/TypeFormatters.cs  |   2 +-
 .../Generated/Models/Friend.Serialization.cs  |  64 +--
 .../src/Generated/Models/Friend.cs            |   4 +-
 ...equiredNullableProperties.Serialization.cs |  70 +--
 .../ModelWithRequiredNullableProperties.cs    |   4 +-
 .../Models/ProjectedModel.Serialization.cs    |  64 +--
 .../src/Generated/Models/ProjectedModel.cs    |   4 +-
 ...rnsAnonymousModelResponse.Serialization.cs |  64 +--
 .../Models/ReturnsAnonymousModelResponse.cs   |   4 +-
 .../Models/RoundTripModel.Serialization.cs    | 164 +++---
 .../src/Generated/Models/RoundTripModel.cs    |  52 +-
 .../Generated/Models/Thing.Serialization.cs   |  84 +--
 .../src/Generated/Models/Thing.cs             |  12 +-
 23 files changed, 685 insertions(+), 684 deletions(-)

diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureClientPlugin.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureClientPlugin.cs
index 84bc3ac98d7e2..49988468dd992 100644
--- a/eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureClientPlugin.cs
+++ b/eng/packages/http-client-csharp/generator/Azure.Generator/src/AzureClientPlugin.cs
@@ -37,6 +37,7 @@ public AzureClientPlugin(GeneratorContext context) : base(context)
     /// </summary>
     public override void Configure()
     {
+        base.Configure();
     }
 
     /// <summary>
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.RestClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.RestClient.cs
index 3a79e46349350..b8bf3fd176a34 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.RestClient.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.RestClient.cs
@@ -14,21 +14,21 @@ namespace BasicTypeSpec
     /// <summary></summary>
     public partial class BasicTypeSpecClient
     {
-        private static System.ClientModel.Primitives.PipelineMessageClassifier _pipelineMessageClassifier200;
-        private static System.ClientModel.Primitives.PipelineMessageClassifier _pipelineMessageClassifier204;
+        private static PipelineMessageClassifier _pipelineMessageClassifier200;
+        private static PipelineMessageClassifier _pipelineMessageClassifier204;
         private static Classifier2xxAnd4xx _pipelineMessageClassifier2xxAnd4xx;
 
-        private static System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 = System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });
+        private static PipelineMessageClassifier PipelineMessageClassifier200 => _pipelineMessageClassifier200 = PipelineMessageClassifier.Create(stackalloc ushort[] { 200 });
 
-        private static System.ClientModel.Primitives.PipelineMessageClassifier PipelineMessageClassifier204 => _pipelineMessageClassifier204 = System.ClientModel.Primitives.PipelineMessageClassifier.Create(stackalloc ushort[] { 204 });
+        private static PipelineMessageClassifier PipelineMessageClassifier204 => _pipelineMessageClassifier204 = PipelineMessageClassifier.Create(stackalloc ushort[] { 204 });
 
         private static Classifier2xxAnd4xx PipelineMessageClassifier2xxAnd4xx => _pipelineMessageClassifier2xxAnd4xx ??= new Classifier2xxAnd4xx();
 
-        internal System.ClientModel.Primitives.PipelineMessage CreateSayHiRequest(string headParameter, string queryParameter, string optionalQuery, System.ClientModel.Primitives.RequestOptions options)
+        internal PipelineMessage CreateSayHiRequest(string headParameter, string queryParameter, string optionalQuery, RequestOptions options)
         {
-            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
+            PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            System.ClientModel.Primitives.PipelineRequest request = message.Request;
+            PipelineRequest request = message.Request;
             request.Method = "GET";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -45,11 +45,11 @@ internal System.ClientModel.Primitives.PipelineMessage CreateSayHiRequest(string
             return message;
         }
 
-        internal System.ClientModel.Primitives.PipelineMessage CreateHelloAgainRequest(string p2, string p1, System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        internal PipelineMessage CreateHelloAgainRequest(string p2, string p1, BinaryContent content, RequestOptions options)
         {
-            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
+            PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            System.ClientModel.Primitives.PipelineRequest request = message.Request;
+            PipelineRequest request = message.Request;
             request.Method = "GET";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -64,11 +64,11 @@ internal System.ClientModel.Primitives.PipelineMessage CreateHelloAgainRequest(s
             return message;
         }
 
-        internal System.ClientModel.Primitives.PipelineMessage CreateNoContentTypeRequest(string p2, string p1, System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        internal PipelineMessage CreateNoContentTypeRequest(string p2, string p1, BinaryContent content, RequestOptions options)
         {
-            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
+            PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            System.ClientModel.Primitives.PipelineRequest request = message.Request;
+            PipelineRequest request = message.Request;
             request.Method = "GET";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -83,11 +83,11 @@ internal System.ClientModel.Primitives.PipelineMessage CreateNoContentTypeReques
             return message;
         }
 
-        internal System.ClientModel.Primitives.PipelineMessage CreateHelloDemo2Request(System.ClientModel.Primitives.RequestOptions options)
+        internal PipelineMessage CreateHelloDemo2Request(RequestOptions options)
         {
-            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
+            PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            System.ClientModel.Primitives.PipelineRequest request = message.Request;
+            PipelineRequest request = message.Request;
             request.Method = "GET";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -98,11 +98,11 @@ internal System.ClientModel.Primitives.PipelineMessage CreateHelloDemo2Request(S
             return message;
         }
 
-        internal System.ClientModel.Primitives.PipelineMessage CreateCreateLiteralRequest(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        internal PipelineMessage CreateCreateLiteralRequest(BinaryContent content, RequestOptions options)
         {
-            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
+            PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            System.ClientModel.Primitives.PipelineRequest request = message.Request;
+            PipelineRequest request = message.Request;
             request.Method = "POST";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -115,11 +115,11 @@ internal System.ClientModel.Primitives.PipelineMessage CreateCreateLiteralReques
             return message;
         }
 
-        internal System.ClientModel.Primitives.PipelineMessage CreateHelloLiteralRequest(System.ClientModel.Primitives.RequestOptions options)
+        internal PipelineMessage CreateHelloLiteralRequest(RequestOptions options)
         {
-            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
+            PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            System.ClientModel.Primitives.PipelineRequest request = message.Request;
+            PipelineRequest request = message.Request;
             request.Method = "GET";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -133,11 +133,11 @@ internal System.ClientModel.Primitives.PipelineMessage CreateHelloLiteralRequest
             return message;
         }
 
-        internal System.ClientModel.Primitives.PipelineMessage CreateTopActionRequest(DateTimeOffset action, System.ClientModel.Primitives.RequestOptions options)
+        internal PipelineMessage CreateTopActionRequest(DateTimeOffset action, RequestOptions options)
         {
-            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
+            PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            System.ClientModel.Primitives.PipelineRequest request = message.Request;
+            PipelineRequest request = message.Request;
             request.Method = "GET";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -149,11 +149,11 @@ internal System.ClientModel.Primitives.PipelineMessage CreateTopActionRequest(Da
             return message;
         }
 
-        internal System.ClientModel.Primitives.PipelineMessage CreateTopAction2Request(System.ClientModel.Primitives.RequestOptions options)
+        internal PipelineMessage CreateTopAction2Request(RequestOptions options)
         {
-            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
+            PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            System.ClientModel.Primitives.PipelineRequest request = message.Request;
+            PipelineRequest request = message.Request;
             request.Method = "GET";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -164,11 +164,11 @@ internal System.ClientModel.Primitives.PipelineMessage CreateTopAction2Request(S
             return message;
         }
 
-        internal System.ClientModel.Primitives.PipelineMessage CreatePatchActionRequest(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        internal PipelineMessage CreatePatchActionRequest(BinaryContent content, RequestOptions options)
         {
-            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
+            PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            System.ClientModel.Primitives.PipelineRequest request = message.Request;
+            PipelineRequest request = message.Request;
             request.Method = "PATCH";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -181,11 +181,11 @@ internal System.ClientModel.Primitives.PipelineMessage CreatePatchActionRequest(
             return message;
         }
 
-        internal System.ClientModel.Primitives.PipelineMessage CreateAnonymousBodyRequest(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        internal PipelineMessage CreateAnonymousBodyRequest(BinaryContent content, RequestOptions options)
         {
-            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
+            PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            System.ClientModel.Primitives.PipelineRequest request = message.Request;
+            PipelineRequest request = message.Request;
             request.Method = "POST";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -198,11 +198,11 @@ internal System.ClientModel.Primitives.PipelineMessage CreateAnonymousBodyReques
             return message;
         }
 
-        internal System.ClientModel.Primitives.PipelineMessage CreateFriendlyModelRequest(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        internal PipelineMessage CreateFriendlyModelRequest(BinaryContent content, RequestOptions options)
         {
-            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
+            PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            System.ClientModel.Primitives.PipelineRequest request = message.Request;
+            PipelineRequest request = message.Request;
             request.Method = "POST";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -215,11 +215,11 @@ internal System.ClientModel.Primitives.PipelineMessage CreateFriendlyModelReques
             return message;
         }
 
-        internal System.ClientModel.Primitives.PipelineMessage CreateAddTimeHeaderRequest(System.ClientModel.Primitives.RequestOptions options)
+        internal PipelineMessage CreateAddTimeHeaderRequest(RequestOptions options)
         {
-            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
+            PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier204;
-            System.ClientModel.Primitives.PipelineRequest request = message.Request;
+            PipelineRequest request = message.Request;
             request.Method = "GET";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -230,11 +230,11 @@ internal System.ClientModel.Primitives.PipelineMessage CreateAddTimeHeaderReques
             return message;
         }
 
-        internal System.ClientModel.Primitives.PipelineMessage CreateProjectedNameModelRequest(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        internal PipelineMessage CreateProjectedNameModelRequest(BinaryContent content, RequestOptions options)
         {
-            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
+            PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            System.ClientModel.Primitives.PipelineRequest request = message.Request;
+            PipelineRequest request = message.Request;
             request.Method = "POST";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -247,11 +247,11 @@ internal System.ClientModel.Primitives.PipelineMessage CreateProjectedNameModelR
             return message;
         }
 
-        internal System.ClientModel.Primitives.PipelineMessage CreateReturnsAnonymousModelRequest(System.ClientModel.Primitives.RequestOptions options)
+        internal PipelineMessage CreateReturnsAnonymousModelRequest(RequestOptions options)
         {
-            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
+            PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            System.ClientModel.Primitives.PipelineRequest request = message.Request;
+            PipelineRequest request = message.Request;
             request.Method = "POST";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -262,11 +262,11 @@ internal System.ClientModel.Primitives.PipelineMessage CreateReturnsAnonymousMod
             return message;
         }
 
-        internal System.ClientModel.Primitives.PipelineMessage CreateGetUnknownValueRequest(string accept, System.ClientModel.Primitives.RequestOptions options)
+        internal PipelineMessage CreateGetUnknownValueRequest(string accept, RequestOptions options)
         {
-            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
+            PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            System.ClientModel.Primitives.PipelineRequest request = message.Request;
+            PipelineRequest request = message.Request;
             request.Method = "GET";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -277,11 +277,11 @@ internal System.ClientModel.Primitives.PipelineMessage CreateGetUnknownValueRequ
             return message;
         }
 
-        internal System.ClientModel.Primitives.PipelineMessage CreateInternalProtocolRequest(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        internal PipelineMessage CreateInternalProtocolRequest(BinaryContent content, RequestOptions options)
         {
-            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
+            PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier200;
-            System.ClientModel.Primitives.PipelineRequest request = message.Request;
+            PipelineRequest request = message.Request;
             request.Method = "POST";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -294,11 +294,11 @@ internal System.ClientModel.Primitives.PipelineMessage CreateInternalProtocolReq
             return message;
         }
 
-        internal System.ClientModel.Primitives.PipelineMessage CreateStillConvenientRequest(System.ClientModel.Primitives.RequestOptions options)
+        internal PipelineMessage CreateStillConvenientRequest(RequestOptions options)
         {
-            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
+            PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier204;
-            System.ClientModel.Primitives.PipelineRequest request = message.Request;
+            PipelineRequest request = message.Request;
             request.Method = "GET";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -308,11 +308,11 @@ internal System.ClientModel.Primitives.PipelineMessage CreateStillConvenientRequ
             return message;
         }
 
-        internal System.ClientModel.Primitives.PipelineMessage CreateHeadAsBooleanRequest(string id, System.ClientModel.Primitives.RequestOptions options)
+        internal PipelineMessage CreateHeadAsBooleanRequest(string id, RequestOptions options)
         {
-            System.ClientModel.Primitives.PipelineMessage message = Pipeline.CreateMessage();
+            PipelineMessage message = Pipeline.CreateMessage();
             message.ResponseClassifier = PipelineMessageClassifier2xxAnd4xx;
-            System.ClientModel.Primitives.PipelineRequest request = message.Request;
+            PipelineRequest request = message.Request;
             request.Method = "HEAD";
             ClientUriBuilder uri = new ClientUriBuilder();
             uri.Reset(_endpoint);
@@ -323,9 +323,9 @@ internal System.ClientModel.Primitives.PipelineMessage CreateHeadAsBooleanReques
             return message;
         }
 
-        private class Classifier2xxAnd4xx : System.ClientModel.Primitives.PipelineMessageClassifier
+        private class Classifier2xxAnd4xx : PipelineMessageClassifier
         {
-            public override bool TryClassify(System.ClientModel.Primitives.PipelineMessage message, out bool isError)
+            public override bool TryClassify(PipelineMessage message, out bool isError)
             {
                 isError = false;
                 if (message.Response == null)
@@ -341,7 +341,7 @@ public override bool TryClassify(System.ClientModel.Primitives.PipelineMessage m
                 return true;
             }
 
-            public override bool TryClassify(System.ClientModel.Primitives.PipelineMessage message, Exception exception, out bool isRetryable)
+            public override bool TryClassify(PipelineMessage message, Exception exception, out bool isRetryable)
             {
                 isRetryable = false;
                 return false;
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.cs
index 3df626196d507..8d0bd106c5f4a 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.cs
@@ -18,10 +18,10 @@ namespace BasicTypeSpec
     /// <summary></summary>
     public partial class BasicTypeSpecClient
     {
-        private readonly System.Uri _endpoint;
+        private readonly Uri _endpoint;
         private const string AuthorizationHeader = "my-api-key";
         /// <summary> A credential used to authenticate to the service. </summary>
-        private readonly System.ClientModel.ApiKeyCredential _keyCredential;
+        private readonly ApiKeyCredential _keyCredential;
 
         /// <summary> Initializes a new instance of BasicTypeSpecClient for mocking. </summary>
         protected BasicTypeSpecClient()
@@ -32,7 +32,7 @@ protected BasicTypeSpecClient()
         /// <param name="endpoint"> Service endpoint. </param>
         /// <param name="keyCredential"> A credential used to authenticate to the service. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="endpoint"/> or <paramref name="keyCredential"/> is null. </exception>
-        public BasicTypeSpecClient(System.Uri endpoint, System.ClientModel.ApiKeyCredential keyCredential) : this(endpoint, keyCredential, new BasicTypeSpecClientOptions())
+        public BasicTypeSpecClient(Uri endpoint, ApiKeyCredential keyCredential) : this(endpoint, keyCredential, new BasicTypeSpecClientOptions())
         {
         }
 
@@ -41,7 +41,7 @@ protected BasicTypeSpecClient()
         /// <param name="keyCredential"> A credential used to authenticate to the service. </param>
         /// <param name="options"> The options for configuring the client. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="endpoint"/> or <paramref name="keyCredential"/> is null. </exception>
-        public BasicTypeSpecClient(System.Uri endpoint, System.ClientModel.ApiKeyCredential keyCredential, BasicTypeSpecClientOptions options)
+        public BasicTypeSpecClient(Uri endpoint, ApiKeyCredential keyCredential, BasicTypeSpecClientOptions options)
         {
             Argument.AssertNotNull(endpoint, nameof(endpoint));
             Argument.AssertNotNull(keyCredential, nameof(keyCredential));
@@ -50,11 +50,11 @@ public BasicTypeSpecClient(System.Uri endpoint, System.ClientModel.ApiKeyCredent
 
             _endpoint = endpoint;
             _keyCredential = keyCredential;
-            Pipeline = System.ClientModel.Primitives.ClientPipeline.Create(options, Array.Empty<System.ClientModel.Primitives.PipelinePolicy>(), new System.ClientModel.Primitives.PipelinePolicy[] { System.ClientModel.Primitives.ApiKeyAuthenticationPolicy.CreateHeaderApiKeyPolicy(_keyCredential, AuthorizationHeader) }, Array.Empty<System.ClientModel.Primitives.PipelinePolicy>());
+            Pipeline = ClientPipeline.Create(options, Array.Empty<PipelinePolicy>(), new PipelinePolicy[] { ApiKeyAuthenticationPolicy.CreateHeaderApiKeyPolicy(_keyCredential, AuthorizationHeader) }, Array.Empty<PipelinePolicy>());
         }
 
         /// <summary> The HTTP pipeline for sending and receiving REST requests and responses. </summary>
-        public System.ClientModel.Primitives.ClientPipeline Pipeline { get; }
+        public ClientPipeline Pipeline { get; }
 
         /// <summary>
         /// [Protocol Method] Return hi
@@ -69,15 +69,15 @@ public BasicTypeSpecClient(System.Uri endpoint, System.ClientModel.ApiKeyCredent
         /// <param name="optionalQuery"></param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="headParameter"/> or <paramref name="queryParameter"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual System.ClientModel.ClientResult SayHi(string headParameter, string queryParameter, string optionalQuery, System.ClientModel.Primitives.RequestOptions options)
+        public virtual ClientResult SayHi(string headParameter, string queryParameter, string optionalQuery, RequestOptions options)
         {
             Argument.AssertNotNull(headParameter, nameof(headParameter));
             Argument.AssertNotNull(queryParameter, nameof(queryParameter));
 
-            using System.ClientModel.Primitives.PipelineMessage message = CreateSayHiRequest(headParameter, queryParameter, optionalQuery, options);
-            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using PipelineMessage message = CreateSayHiRequest(headParameter, queryParameter, optionalQuery, options);
+            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -93,15 +93,15 @@ public virtual System.ClientModel.ClientResult SayHi(string headParameter, strin
         /// <param name="optionalQuery"></param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="headParameter"/> or <paramref name="queryParameter"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<System.ClientModel.ClientResult> SayHiAsync(string headParameter, string queryParameter, string optionalQuery, System.ClientModel.Primitives.RequestOptions options)
+        public virtual async Task<ClientResult> SayHiAsync(string headParameter, string queryParameter, string optionalQuery, RequestOptions options)
         {
             Argument.AssertNotNull(headParameter, nameof(headParameter));
             Argument.AssertNotNull(queryParameter, nameof(queryParameter));
 
-            using System.ClientModel.Primitives.PipelineMessage message = CreateSayHiRequest(headParameter, queryParameter, optionalQuery, options);
-            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using PipelineMessage message = CreateSayHiRequest(headParameter, queryParameter, optionalQuery, options);
+            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> Return hi. </summary>
@@ -109,14 +109,14 @@ public virtual System.ClientModel.ClientResult SayHi(string headParameter, strin
         /// <param name="queryParameter"></param>
         /// <param name="optionalQuery"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="headParameter"/> or <paramref name="queryParameter"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual System.ClientModel.ClientResult<Thing> SayHi(string headParameter, string queryParameter, string optionalQuery)
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual ClientResult<Thing> SayHi(string headParameter, string queryParameter, string optionalQuery)
         {
             Argument.AssertNotNull(headParameter, nameof(headParameter));
             Argument.AssertNotNull(queryParameter, nameof(queryParameter));
 
-            System.ClientModel.ClientResult result = SayHi(headParameter, queryParameter, optionalQuery, null);
-            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            ClientResult result = SayHi(headParameter, queryParameter, optionalQuery, null);
+            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary> Return hi. </summary>
@@ -124,14 +124,14 @@ public virtual System.ClientModel.ClientResult<Thing> SayHi(string headParameter
         /// <param name="queryParameter"></param>
         /// <param name="optionalQuery"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="headParameter"/> or <paramref name="queryParameter"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<System.ClientModel.ClientResult<Thing>> SayHiAsync(string headParameter, string queryParameter, string optionalQuery)
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<ClientResult<Thing>> SayHiAsync(string headParameter, string queryParameter, string optionalQuery)
         {
             Argument.AssertNotNull(headParameter, nameof(headParameter));
             Argument.AssertNotNull(queryParameter, nameof(queryParameter));
 
-            System.ClientModel.ClientResult result = await SayHiAsync(headParameter, queryParameter, optionalQuery, null).ConfigureAwait(false);
-            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            ClientResult result = await SayHiAsync(headParameter, queryParameter, optionalQuery, null).ConfigureAwait(false);
+            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary>
@@ -147,16 +147,16 @@ public virtual System.ClientModel.ClientResult<Thing> SayHi(string headParameter
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="p2"/>, <paramref name="p1"/> or <paramref name="content"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual System.ClientModel.ClientResult HelloAgain(string p2, string p1, System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        public virtual ClientResult HelloAgain(string p2, string p1, BinaryContent content, RequestOptions options)
         {
             Argument.AssertNotNull(p2, nameof(p2));
             Argument.AssertNotNull(p1, nameof(p1));
             Argument.AssertNotNull(content, nameof(content));
 
-            using System.ClientModel.Primitives.PipelineMessage message = CreateHelloAgainRequest(p2, p1, content, options);
-            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using PipelineMessage message = CreateHelloAgainRequest(p2, p1, content, options);
+            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -172,16 +172,16 @@ public virtual System.ClientModel.ClientResult HelloAgain(string p2, string p1,
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="p2"/>, <paramref name="p1"/> or <paramref name="content"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<System.ClientModel.ClientResult> HelloAgainAsync(string p2, string p1, System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        public virtual async Task<ClientResult> HelloAgainAsync(string p2, string p1, BinaryContent content, RequestOptions options)
         {
             Argument.AssertNotNull(p2, nameof(p2));
             Argument.AssertNotNull(p1, nameof(p1));
             Argument.AssertNotNull(content, nameof(content));
 
-            using System.ClientModel.Primitives.PipelineMessage message = CreateHelloAgainRequest(p2, p1, content, options);
-            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using PipelineMessage message = CreateHelloAgainRequest(p2, p1, content, options);
+            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> Return hi again. </summary>
@@ -189,15 +189,15 @@ public virtual System.ClientModel.ClientResult HelloAgain(string p2, string p1,
         /// <param name="p1"></param>
         /// <param name="action"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="p2"/>, <paramref name="p1"/> or <paramref name="action"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual System.ClientModel.ClientResult<RoundTripModel> HelloAgain(string p2, string p1, RoundTripModel action)
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual ClientResult<RoundTripModel> HelloAgain(string p2, string p1, RoundTripModel action)
         {
             Argument.AssertNotNull(p2, nameof(p2));
             Argument.AssertNotNull(p1, nameof(p1));
             Argument.AssertNotNull(action, nameof(action));
 
-            System.ClientModel.ClientResult result = this.HelloAgain(p2, p1, action, null);
-            return System.ClientModel.ClientResult.FromValue((RoundTripModel)result, result.GetRawResponse());
+            ClientResult result = HelloAgain(p2, p1, action, null);
+            return ClientResult.FromValue((RoundTripModel)result, result.GetRawResponse());
         }
 
         /// <summary> Return hi again. </summary>
@@ -205,15 +205,15 @@ public virtual System.ClientModel.ClientResult<RoundTripModel> HelloAgain(string
         /// <param name="p1"></param>
         /// <param name="action"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="p2"/>, <paramref name="p1"/> or <paramref name="action"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<System.ClientModel.ClientResult<RoundTripModel>> HelloAgainAsync(string p2, string p1, RoundTripModel action)
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<ClientResult<RoundTripModel>> HelloAgainAsync(string p2, string p1, RoundTripModel action)
         {
             Argument.AssertNotNull(p2, nameof(p2));
             Argument.AssertNotNull(p1, nameof(p1));
             Argument.AssertNotNull(action, nameof(action));
 
-            System.ClientModel.ClientResult result = await this.HelloAgainAsync(p2, p1, action, null).ConfigureAwait(false);
-            return System.ClientModel.ClientResult.FromValue((RoundTripModel)result, result.GetRawResponse());
+            ClientResult result = await HelloAgainAsync(p2, p1, action, null).ConfigureAwait(false);
+            return ClientResult.FromValue((RoundTripModel)result, result.GetRawResponse());
         }
 
         /// <summary>
@@ -229,16 +229,16 @@ public virtual System.ClientModel.ClientResult<RoundTripModel> HelloAgain(string
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="p2"/>, <paramref name="p1"/> or <paramref name="content"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual System.ClientModel.ClientResult NoContentType(string p2, string p1, System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        public virtual ClientResult NoContentType(string p2, string p1, BinaryContent content, RequestOptions options)
         {
             Argument.AssertNotNull(p2, nameof(p2));
             Argument.AssertNotNull(p1, nameof(p1));
             Argument.AssertNotNull(content, nameof(content));
 
-            using System.ClientModel.Primitives.PipelineMessage message = CreateNoContentTypeRequest(p2, p1, content, options);
-            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using PipelineMessage message = CreateNoContentTypeRequest(p2, p1, content, options);
+            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -254,16 +254,16 @@ public virtual System.ClientModel.ClientResult NoContentType(string p2, string p
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="p2"/>, <paramref name="p1"/> or <paramref name="content"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<System.ClientModel.ClientResult> NoContentTypeAsync(string p2, string p1, System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        public virtual async Task<ClientResult> NoContentTypeAsync(string p2, string p1, BinaryContent content, RequestOptions options)
         {
             Argument.AssertNotNull(p2, nameof(p2));
             Argument.AssertNotNull(p1, nameof(p1));
             Argument.AssertNotNull(content, nameof(content));
 
-            using System.ClientModel.Primitives.PipelineMessage message = CreateNoContentTypeRequest(p2, p1, content, options);
-            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using PipelineMessage message = CreateNoContentTypeRequest(p2, p1, content, options);
+            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary>
@@ -275,12 +275,12 @@ public virtual System.ClientModel.ClientResult NoContentType(string p2, string p
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual System.ClientModel.ClientResult HelloDemo2(System.ClientModel.Primitives.RequestOptions options)
+        public virtual ClientResult HelloDemo2(RequestOptions options)
         {
-            using System.ClientModel.Primitives.PipelineMessage message = CreateHelloDemo2Request(options);
-            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using PipelineMessage message = CreateHelloDemo2Request(options);
+            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -292,28 +292,28 @@ public virtual System.ClientModel.ClientResult HelloDemo2(System.ClientModel.Pri
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<System.ClientModel.ClientResult> HelloDemo2Async(System.ClientModel.Primitives.RequestOptions options)
+        public virtual async Task<ClientResult> HelloDemo2Async(RequestOptions options)
         {
-            using System.ClientModel.Primitives.PipelineMessage message = CreateHelloDemo2Request(options);
-            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using PipelineMessage message = CreateHelloDemo2Request(options);
+            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> Return hi in demo2. </summary>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual System.ClientModel.ClientResult<Thing> HelloDemo2()
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual ClientResult<Thing> HelloDemo2()
         {
-            System.ClientModel.ClientResult result = HelloDemo2(null);
-            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            ClientResult result = HelloDemo2(null);
+            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary> Return hi in demo2. </summary>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<System.ClientModel.ClientResult<Thing>> HelloDemo2Async()
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<ClientResult<Thing>> HelloDemo2Async()
         {
-            System.ClientModel.ClientResult result = await HelloDemo2Async(null).ConfigureAwait(false);
-            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            ClientResult result = await HelloDemo2Async(null).ConfigureAwait(false);
+            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary>
@@ -327,14 +327,14 @@ public virtual System.ClientModel.ClientResult<Thing> HelloDemo2()
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual System.ClientModel.ClientResult CreateLiteral(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        public virtual ClientResult CreateLiteral(BinaryContent content, RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using System.ClientModel.Primitives.PipelineMessage message = CreateCreateLiteralRequest(content, options);
-            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using PipelineMessage message = CreateCreateLiteralRequest(content, options);
+            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -348,38 +348,38 @@ public virtual System.ClientModel.ClientResult CreateLiteral(System.ClientModel.
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<System.ClientModel.ClientResult> CreateLiteralAsync(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        public virtual async Task<ClientResult> CreateLiteralAsync(BinaryContent content, RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using System.ClientModel.Primitives.PipelineMessage message = CreateCreateLiteralRequest(content, options);
-            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using PipelineMessage message = CreateCreateLiteralRequest(content, options);
+            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> Create with literal value. </summary>
         /// <param name="body"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual System.ClientModel.ClientResult<Thing> CreateLiteral(Thing body)
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual ClientResult<Thing> CreateLiteral(Thing body)
         {
             Argument.AssertNotNull(body, nameof(body));
 
-            System.ClientModel.ClientResult result = this.CreateLiteral(body, null);
-            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            ClientResult result = CreateLiteral(body, null);
+            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary> Create with literal value. </summary>
         /// <param name="body"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<System.ClientModel.ClientResult<Thing>> CreateLiteralAsync(Thing body)
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<ClientResult<Thing>> CreateLiteralAsync(Thing body)
         {
             Argument.AssertNotNull(body, nameof(body));
 
-            System.ClientModel.ClientResult result = await this.CreateLiteralAsync(body, null).ConfigureAwait(false);
-            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            ClientResult result = await CreateLiteralAsync(body, null).ConfigureAwait(false);
+            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary>
@@ -391,12 +391,12 @@ public virtual System.ClientModel.ClientResult<Thing> CreateLiteral(Thing body)
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual System.ClientModel.ClientResult HelloLiteral(System.ClientModel.Primitives.RequestOptions options)
+        public virtual ClientResult HelloLiteral(RequestOptions options)
         {
-            using System.ClientModel.Primitives.PipelineMessage message = CreateHelloLiteralRequest(options);
-            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using PipelineMessage message = CreateHelloLiteralRequest(options);
+            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -408,28 +408,28 @@ public virtual System.ClientModel.ClientResult HelloLiteral(System.ClientModel.P
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<System.ClientModel.ClientResult> HelloLiteralAsync(System.ClientModel.Primitives.RequestOptions options)
+        public virtual async Task<ClientResult> HelloLiteralAsync(RequestOptions options)
         {
-            using System.ClientModel.Primitives.PipelineMessage message = CreateHelloLiteralRequest(options);
-            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using PipelineMessage message = CreateHelloLiteralRequest(options);
+            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> Send literal parameters. </summary>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual System.ClientModel.ClientResult<Thing> HelloLiteral()
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual ClientResult<Thing> HelloLiteral()
         {
-            System.ClientModel.ClientResult result = HelloLiteral(null);
-            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            ClientResult result = HelloLiteral(null);
+            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary> Send literal parameters. </summary>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<System.ClientModel.ClientResult<Thing>> HelloLiteralAsync()
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<ClientResult<Thing>> HelloLiteralAsync()
         {
-            System.ClientModel.ClientResult result = await HelloLiteralAsync(null).ConfigureAwait(false);
-            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            ClientResult result = await HelloLiteralAsync(null).ConfigureAwait(false);
+            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary>
@@ -442,12 +442,12 @@ public virtual System.ClientModel.ClientResult<Thing> HelloLiteral()
         /// </summary>
         /// <param name="action"></param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual System.ClientModel.ClientResult TopAction(DateTimeOffset action, System.ClientModel.Primitives.RequestOptions options)
+        public virtual ClientResult TopAction(DateTimeOffset action, RequestOptions options)
         {
-            using System.ClientModel.Primitives.PipelineMessage message = CreateTopActionRequest(action, options);
-            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using PipelineMessage message = CreateTopActionRequest(action, options);
+            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -460,30 +460,30 @@ public virtual System.ClientModel.ClientResult TopAction(DateTimeOffset action,
         /// </summary>
         /// <param name="action"></param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<System.ClientModel.ClientResult> TopActionAsync(DateTimeOffset action, System.ClientModel.Primitives.RequestOptions options)
+        public virtual async Task<ClientResult> TopActionAsync(DateTimeOffset action, RequestOptions options)
         {
-            using System.ClientModel.Primitives.PipelineMessage message = CreateTopActionRequest(action, options);
-            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using PipelineMessage message = CreateTopActionRequest(action, options);
+            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> top level method. </summary>
         /// <param name="action"></param>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual System.ClientModel.ClientResult<Thing> TopAction(DateTimeOffset action)
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual ClientResult<Thing> TopAction(DateTimeOffset action)
         {
-            System.ClientModel.ClientResult result = TopAction(action, null);
-            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            ClientResult result = TopAction(action, null);
+            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary> top level method. </summary>
         /// <param name="action"></param>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<System.ClientModel.ClientResult<Thing>> TopActionAsync(DateTimeOffset action)
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<ClientResult<Thing>> TopActionAsync(DateTimeOffset action)
         {
-            System.ClientModel.ClientResult result = await TopActionAsync(action, null).ConfigureAwait(false);
-            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            ClientResult result = await TopActionAsync(action, null).ConfigureAwait(false);
+            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary>
@@ -495,12 +495,12 @@ public virtual System.ClientModel.ClientResult<Thing> TopAction(DateTimeOffset a
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual System.ClientModel.ClientResult TopAction2(System.ClientModel.Primitives.RequestOptions options)
+        public virtual ClientResult TopAction2(RequestOptions options)
         {
-            using System.ClientModel.Primitives.PipelineMessage message = CreateTopAction2Request(options);
-            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using PipelineMessage message = CreateTopAction2Request(options);
+            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -512,12 +512,12 @@ public virtual System.ClientModel.ClientResult TopAction2(System.ClientModel.Pri
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<System.ClientModel.ClientResult> TopAction2Async(System.ClientModel.Primitives.RequestOptions options)
+        public virtual async Task<ClientResult> TopAction2Async(RequestOptions options)
         {
-            using System.ClientModel.Primitives.PipelineMessage message = CreateTopAction2Request(options);
-            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using PipelineMessage message = CreateTopAction2Request(options);
+            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary>
@@ -531,14 +531,14 @@ public virtual System.ClientModel.ClientResult TopAction2(System.ClientModel.Pri
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual System.ClientModel.ClientResult PatchAction(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        public virtual ClientResult PatchAction(BinaryContent content, RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using System.ClientModel.Primitives.PipelineMessage message = CreatePatchActionRequest(content, options);
-            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using PipelineMessage message = CreatePatchActionRequest(content, options);
+            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -552,14 +552,14 @@ public virtual System.ClientModel.ClientResult PatchAction(System.ClientModel.Bi
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<System.ClientModel.ClientResult> PatchActionAsync(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        public virtual async Task<ClientResult> PatchActionAsync(BinaryContent content, RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using System.ClientModel.Primitives.PipelineMessage message = CreatePatchActionRequest(content, options);
-            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using PipelineMessage message = CreatePatchActionRequest(content, options);
+            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary>
@@ -573,14 +573,14 @@ public virtual System.ClientModel.ClientResult PatchAction(System.ClientModel.Bi
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual System.ClientModel.ClientResult AnonymousBody(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        public virtual ClientResult AnonymousBody(BinaryContent content, RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using System.ClientModel.Primitives.PipelineMessage message = CreateAnonymousBodyRequest(content, options);
-            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using PipelineMessage message = CreateAnonymousBodyRequest(content, options);
+            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -594,14 +594,14 @@ public virtual System.ClientModel.ClientResult AnonymousBody(System.ClientModel.
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<System.ClientModel.ClientResult> AnonymousBodyAsync(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        public virtual async Task<ClientResult> AnonymousBodyAsync(BinaryContent content, RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using System.ClientModel.Primitives.PipelineMessage message = CreateAnonymousBodyRequest(content, options);
-            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using PipelineMessage message = CreateAnonymousBodyRequest(content, options);
+            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> body parameter without body decorator. </summary>
@@ -619,8 +619,8 @@ public virtual System.ClientModel.ClientResult AnonymousBody(System.ClientModel.
         /// <param name="optionalLiteralBool"></param>
         /// <param name="optionalNullableList"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/>, <paramref name="requiredUnion"/> or <paramref name="requiredBadDescription"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual System.ClientModel.ClientResult<Thing> AnonymousBody(string name, System.BinaryData requiredUnion, ThingRequiredLiteralString requiredLiteralString, ThingRequiredLiteralInt requiredLiteralInt, ThingRequiredLiteralFloat requiredLiteralFloat, bool requiredLiteralBool, string requiredBadDescription, IEnumerable<int> requiredNullableList, ThingOptionalLiteralString? optionalLiteralString = default, ThingOptionalLiteralInt? optionalLiteralInt = default, ThingOptionalLiteralFloat? optionalLiteralFloat = default, bool? optionalLiteralBool = default, IEnumerable<int> optionalNullableList = default)
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual ClientResult<Thing> AnonymousBody(string name, BinaryData requiredUnion, ThingRequiredLiteralString requiredLiteralString, ThingRequiredLiteralInt requiredLiteralInt, ThingRequiredLiteralFloat requiredLiteralFloat, bool requiredLiteralBool, string requiredBadDescription, IEnumerable<int> requiredNullableList, ThingOptionalLiteralString? optionalLiteralString = default, ThingOptionalLiteralInt? optionalLiteralInt = default, ThingOptionalLiteralFloat? optionalLiteralFloat = default, bool? optionalLiteralBool = default, IEnumerable<int> optionalNullableList = default)
         {
             Argument.AssertNotNull(name, nameof(name));
             Argument.AssertNotNull(requiredUnion, nameof(requiredUnion));
@@ -641,8 +641,8 @@ public virtual System.ClientModel.ClientResult<Thing> AnonymousBody(string name,
                 optionalNullableList?.ToList() as IList<int> ?? new ChangeTrackingList<int>(),
                 requiredNullableList?.ToList() as IList<int> ?? new ChangeTrackingList<int>(),
                 null);
-            System.ClientModel.ClientResult result = this.AnonymousBody(spreadModel, null);
-            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            ClientResult result = AnonymousBody(spreadModel, null);
+            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary> body parameter without body decorator. </summary>
@@ -660,8 +660,8 @@ public virtual System.ClientModel.ClientResult<Thing> AnonymousBody(string name,
         /// <param name="optionalLiteralBool"></param>
         /// <param name="optionalNullableList"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/>, <paramref name="requiredUnion"/> or <paramref name="requiredBadDescription"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<System.ClientModel.ClientResult<Thing>> AnonymousBodyAsync(string name, System.BinaryData requiredUnion, ThingRequiredLiteralString requiredLiteralString, ThingRequiredLiteralInt requiredLiteralInt, ThingRequiredLiteralFloat requiredLiteralFloat, bool requiredLiteralBool, string requiredBadDescription, IEnumerable<int> requiredNullableList, ThingOptionalLiteralString? optionalLiteralString = default, ThingOptionalLiteralInt? optionalLiteralInt = default, ThingOptionalLiteralFloat? optionalLiteralFloat = default, bool? optionalLiteralBool = default, IEnumerable<int> optionalNullableList = default)
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<ClientResult<Thing>> AnonymousBodyAsync(string name, BinaryData requiredUnion, ThingRequiredLiteralString requiredLiteralString, ThingRequiredLiteralInt requiredLiteralInt, ThingRequiredLiteralFloat requiredLiteralFloat, bool requiredLiteralBool, string requiredBadDescription, IEnumerable<int> requiredNullableList, ThingOptionalLiteralString? optionalLiteralString = default, ThingOptionalLiteralInt? optionalLiteralInt = default, ThingOptionalLiteralFloat? optionalLiteralFloat = default, bool? optionalLiteralBool = default, IEnumerable<int> optionalNullableList = default)
         {
             Argument.AssertNotNull(name, nameof(name));
             Argument.AssertNotNull(requiredUnion, nameof(requiredUnion));
@@ -682,8 +682,8 @@ public virtual System.ClientModel.ClientResult<Thing> AnonymousBody(string name,
                 optionalNullableList?.ToList() as IList<int> ?? new ChangeTrackingList<int>(),
                 requiredNullableList?.ToList() as IList<int> ?? new ChangeTrackingList<int>(),
                 null);
-            System.ClientModel.ClientResult result = await this.AnonymousBodyAsync(spreadModel, null).ConfigureAwait(false);
-            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            ClientResult result = await AnonymousBodyAsync(spreadModel, null).ConfigureAwait(false);
+            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary>
@@ -697,14 +697,14 @@ public virtual System.ClientModel.ClientResult<Thing> AnonymousBody(string name,
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual System.ClientModel.ClientResult FriendlyModel(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        public virtual ClientResult FriendlyModel(BinaryContent content, RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using System.ClientModel.Primitives.PipelineMessage message = CreateFriendlyModelRequest(content, options);
-            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using PipelineMessage message = CreateFriendlyModelRequest(content, options);
+            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -718,40 +718,40 @@ public virtual System.ClientModel.ClientResult FriendlyModel(System.ClientModel.
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<System.ClientModel.ClientResult> FriendlyModelAsync(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        public virtual async Task<ClientResult> FriendlyModelAsync(BinaryContent content, RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using System.ClientModel.Primitives.PipelineMessage message = CreateFriendlyModelRequest(content, options);
-            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using PipelineMessage message = CreateFriendlyModelRequest(content, options);
+            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> Model can have its friendly name. </summary>
         /// <param name="name"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual System.ClientModel.ClientResult<Friend> FriendlyModel(string name)
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual ClientResult<Friend> FriendlyModel(string name)
         {
             Argument.AssertNotNull(name, nameof(name));
 
             Friend spreadModel = new Friend(name, null);
-            System.ClientModel.ClientResult result = this.FriendlyModel(spreadModel, null);
-            return System.ClientModel.ClientResult.FromValue((Friend)result, result.GetRawResponse());
+            ClientResult result = FriendlyModel(spreadModel, null);
+            return ClientResult.FromValue((Friend)result, result.GetRawResponse());
         }
 
         /// <summary> Model can have its friendly name. </summary>
         /// <param name="name"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<System.ClientModel.ClientResult<Friend>> FriendlyModelAsync(string name)
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<ClientResult<Friend>> FriendlyModelAsync(string name)
         {
             Argument.AssertNotNull(name, nameof(name));
 
             Friend spreadModel = new Friend(name, null);
-            System.ClientModel.ClientResult result = await this.FriendlyModelAsync(spreadModel, null).ConfigureAwait(false);
-            return System.ClientModel.ClientResult.FromValue((Friend)result, result.GetRawResponse());
+            ClientResult result = await FriendlyModelAsync(spreadModel, null).ConfigureAwait(false);
+            return ClientResult.FromValue((Friend)result, result.GetRawResponse());
         }
 
         /// <summary>
@@ -763,12 +763,12 @@ public virtual System.ClientModel.ClientResult<Friend> FriendlyModel(string name
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual System.ClientModel.ClientResult AddTimeHeader(System.ClientModel.Primitives.RequestOptions options)
+        public virtual ClientResult AddTimeHeader(RequestOptions options)
         {
-            using System.ClientModel.Primitives.PipelineMessage message = CreateAddTimeHeaderRequest(options);
-            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using PipelineMessage message = CreateAddTimeHeaderRequest(options);
+            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -780,24 +780,24 @@ public virtual System.ClientModel.ClientResult AddTimeHeader(System.ClientModel.
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<System.ClientModel.ClientResult> AddTimeHeaderAsync(System.ClientModel.Primitives.RequestOptions options)
+        public virtual async Task<ClientResult> AddTimeHeaderAsync(RequestOptions options)
         {
-            using System.ClientModel.Primitives.PipelineMessage message = CreateAddTimeHeaderRequest(options);
-            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using PipelineMessage message = CreateAddTimeHeaderRequest(options);
+            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> addTimeHeader. </summary>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual System.ClientModel.ClientResult AddTimeHeader()
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual ClientResult AddTimeHeader()
         {
             return AddTimeHeader(null);
         }
 
         /// <summary> addTimeHeader. </summary>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<System.ClientModel.ClientResult> AddTimeHeaderAsync()
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<ClientResult> AddTimeHeaderAsync()
         {
             return await AddTimeHeaderAsync(null).ConfigureAwait(false);
         }
@@ -813,14 +813,14 @@ public virtual System.ClientModel.ClientResult AddTimeHeader()
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual System.ClientModel.ClientResult ProjectedNameModel(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        public virtual ClientResult ProjectedNameModel(BinaryContent content, RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using System.ClientModel.Primitives.PipelineMessage message = CreateProjectedNameModelRequest(content, options);
-            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using PipelineMessage message = CreateProjectedNameModelRequest(content, options);
+            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -834,40 +834,40 @@ public virtual System.ClientModel.ClientResult ProjectedNameModel(System.ClientM
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<System.ClientModel.ClientResult> ProjectedNameModelAsync(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        public virtual async Task<ClientResult> ProjectedNameModelAsync(BinaryContent content, RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using System.ClientModel.Primitives.PipelineMessage message = CreateProjectedNameModelRequest(content, options);
-            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using PipelineMessage message = CreateProjectedNameModelRequest(content, options);
+            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> Model can have its projected name. </summary>
         /// <param name="name"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual System.ClientModel.ClientResult<ProjectedModel> ProjectedNameModel(string name)
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual ClientResult<ProjectedModel> ProjectedNameModel(string name)
         {
             Argument.AssertNotNull(name, nameof(name));
 
             ProjectedModel spreadModel = new ProjectedModel(name, null);
-            System.ClientModel.ClientResult result = this.ProjectedNameModel(spreadModel, null);
-            return System.ClientModel.ClientResult.FromValue((ProjectedModel)result, result.GetRawResponse());
+            ClientResult result = ProjectedNameModel(spreadModel, null);
+            return ClientResult.FromValue((ProjectedModel)result, result.GetRawResponse());
         }
 
         /// <summary> Model can have its projected name. </summary>
         /// <param name="name"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<System.ClientModel.ClientResult<ProjectedModel>> ProjectedNameModelAsync(string name)
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<ClientResult<ProjectedModel>> ProjectedNameModelAsync(string name)
         {
             Argument.AssertNotNull(name, nameof(name));
 
             ProjectedModel spreadModel = new ProjectedModel(name, null);
-            System.ClientModel.ClientResult result = await this.ProjectedNameModelAsync(spreadModel, null).ConfigureAwait(false);
-            return System.ClientModel.ClientResult.FromValue((ProjectedModel)result, result.GetRawResponse());
+            ClientResult result = await ProjectedNameModelAsync(spreadModel, null).ConfigureAwait(false);
+            return ClientResult.FromValue((ProjectedModel)result, result.GetRawResponse());
         }
 
         /// <summary>
@@ -879,12 +879,12 @@ public virtual System.ClientModel.ClientResult<ProjectedModel> ProjectedNameMode
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual System.ClientModel.ClientResult ReturnsAnonymousModel(System.ClientModel.Primitives.RequestOptions options)
+        public virtual ClientResult ReturnsAnonymousModel(RequestOptions options)
         {
-            using System.ClientModel.Primitives.PipelineMessage message = CreateReturnsAnonymousModelRequest(options);
-            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using PipelineMessage message = CreateReturnsAnonymousModelRequest(options);
+            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -896,28 +896,28 @@ public virtual System.ClientModel.ClientResult ReturnsAnonymousModel(System.Clie
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<System.ClientModel.ClientResult> ReturnsAnonymousModelAsync(System.ClientModel.Primitives.RequestOptions options)
+        public virtual async Task<ClientResult> ReturnsAnonymousModelAsync(RequestOptions options)
         {
-            using System.ClientModel.Primitives.PipelineMessage message = CreateReturnsAnonymousModelRequest(options);
-            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using PipelineMessage message = CreateReturnsAnonymousModelRequest(options);
+            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> return anonymous model. </summary>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual System.ClientModel.ClientResult<ReturnsAnonymousModelResponse> ReturnsAnonymousModel()
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual ClientResult<ReturnsAnonymousModelResponse> ReturnsAnonymousModel()
         {
-            System.ClientModel.ClientResult result = ReturnsAnonymousModel(null);
-            return System.ClientModel.ClientResult.FromValue((ReturnsAnonymousModelResponse)result, result.GetRawResponse());
+            ClientResult result = ReturnsAnonymousModel(null);
+            return ClientResult.FromValue((ReturnsAnonymousModelResponse)result, result.GetRawResponse());
         }
 
         /// <summary> return anonymous model. </summary>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<System.ClientModel.ClientResult<ReturnsAnonymousModelResponse>> ReturnsAnonymousModelAsync()
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<ClientResult<ReturnsAnonymousModelResponse>> ReturnsAnonymousModelAsync()
         {
-            System.ClientModel.ClientResult result = await ReturnsAnonymousModelAsync(null).ConfigureAwait(false);
-            return System.ClientModel.ClientResult.FromValue((ReturnsAnonymousModelResponse)result, result.GetRawResponse());
+            ClientResult result = await ReturnsAnonymousModelAsync(null).ConfigureAwait(false);
+            return ClientResult.FromValue((ReturnsAnonymousModelResponse)result, result.GetRawResponse());
         }
 
         /// <summary>
@@ -931,14 +931,14 @@ public virtual System.ClientModel.ClientResult<ReturnsAnonymousModelResponse> Re
         /// <param name="accept"></param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="accept"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual System.ClientModel.ClientResult GetUnknownValue(string accept, System.ClientModel.Primitives.RequestOptions options)
+        public virtual ClientResult GetUnknownValue(string accept, RequestOptions options)
         {
             Argument.AssertNotNull(accept, nameof(accept));
 
-            using System.ClientModel.Primitives.PipelineMessage message = CreateGetUnknownValueRequest(accept, options);
-            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using PipelineMessage message = CreateGetUnknownValueRequest(accept, options);
+            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -952,38 +952,38 @@ public virtual System.ClientModel.ClientResult GetUnknownValue(string accept, Sy
         /// <param name="accept"></param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="accept"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<System.ClientModel.ClientResult> GetUnknownValueAsync(string accept, System.ClientModel.Primitives.RequestOptions options)
+        public virtual async Task<ClientResult> GetUnknownValueAsync(string accept, RequestOptions options)
         {
             Argument.AssertNotNull(accept, nameof(accept));
 
-            using System.ClientModel.Primitives.PipelineMessage message = CreateGetUnknownValueRequest(accept, options);
-            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using PipelineMessage message = CreateGetUnknownValueRequest(accept, options);
+            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> get extensible enum. </summary>
         /// <param name="accept"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="accept"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual System.ClientModel.ClientResult<string> GetUnknownValue(string accept)
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual ClientResult<string> GetUnknownValue(string accept)
         {
             Argument.AssertNotNull(accept, nameof(accept));
 
-            System.ClientModel.ClientResult result = GetUnknownValue(accept, null);
-            return System.ClientModel.ClientResult.FromValue(result.GetRawResponse().Content.ToObjectFromJson<string>(), result.GetRawResponse());
+            ClientResult result = GetUnknownValue(accept, null);
+            return ClientResult.FromValue(result.GetRawResponse().Content.ToObjectFromJson<string>(), result.GetRawResponse());
         }
 
         /// <summary> get extensible enum. </summary>
         /// <param name="accept"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="accept"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<System.ClientModel.ClientResult<string>> GetUnknownValueAsync(string accept)
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<ClientResult<string>> GetUnknownValueAsync(string accept)
         {
             Argument.AssertNotNull(accept, nameof(accept));
 
-            System.ClientModel.ClientResult result = await GetUnknownValueAsync(accept, null).ConfigureAwait(false);
-            return System.ClientModel.ClientResult.FromValue(result.GetRawResponse().Content.ToObjectFromJson<string>(), result.GetRawResponse());
+            ClientResult result = await GetUnknownValueAsync(accept, null).ConfigureAwait(false);
+            return ClientResult.FromValue(result.GetRawResponse().Content.ToObjectFromJson<string>(), result.GetRawResponse());
         }
 
         /// <summary>
@@ -997,14 +997,14 @@ public virtual System.ClientModel.ClientResult<string> GetUnknownValue(string ac
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual System.ClientModel.ClientResult InternalProtocol(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        public virtual ClientResult InternalProtocol(BinaryContent content, RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using System.ClientModel.Primitives.PipelineMessage message = CreateInternalProtocolRequest(content, options);
-            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using PipelineMessage message = CreateInternalProtocolRequest(content, options);
+            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -1018,38 +1018,38 @@ public virtual System.ClientModel.ClientResult InternalProtocol(System.ClientMod
         /// <param name="content"> The content to send as the body of the request. </param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="content"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<System.ClientModel.ClientResult> InternalProtocolAsync(System.ClientModel.BinaryContent content, System.ClientModel.Primitives.RequestOptions options)
+        public virtual async Task<ClientResult> InternalProtocolAsync(BinaryContent content, RequestOptions options)
         {
             Argument.AssertNotNull(content, nameof(content));
 
-            using System.ClientModel.Primitives.PipelineMessage message = CreateInternalProtocolRequest(content, options);
-            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using PipelineMessage message = CreateInternalProtocolRequest(content, options);
+            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> When set protocol false and convenient true, then the protocol method should be internal. </summary>
         /// <param name="body"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual System.ClientModel.ClientResult<Thing> InternalProtocol(Thing body)
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual ClientResult<Thing> InternalProtocol(Thing body)
         {
             Argument.AssertNotNull(body, nameof(body));
 
-            System.ClientModel.ClientResult result = this.InternalProtocol(body, null);
-            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            ClientResult result = InternalProtocol(body, null);
+            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary> When set protocol false and convenient true, then the protocol method should be internal. </summary>
         /// <param name="body"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="body"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<System.ClientModel.ClientResult<Thing>> InternalProtocolAsync(Thing body)
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<ClientResult<Thing>> InternalProtocolAsync(Thing body)
         {
             Argument.AssertNotNull(body, nameof(body));
 
-            System.ClientModel.ClientResult result = await this.InternalProtocolAsync(body, null).ConfigureAwait(false);
-            return System.ClientModel.ClientResult.FromValue((Thing)result, result.GetRawResponse());
+            ClientResult result = await InternalProtocolAsync(body, null).ConfigureAwait(false);
+            return ClientResult.FromValue((Thing)result, result.GetRawResponse());
         }
 
         /// <summary>
@@ -1061,12 +1061,12 @@ public virtual System.ClientModel.ClientResult<Thing> InternalProtocol(Thing bod
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual System.ClientModel.ClientResult StillConvenient(System.ClientModel.Primitives.RequestOptions options)
+        public virtual ClientResult StillConvenient(RequestOptions options)
         {
-            using System.ClientModel.Primitives.PipelineMessage message = CreateStillConvenientRequest(options);
-            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using PipelineMessage message = CreateStillConvenientRequest(options);
+            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -1078,24 +1078,24 @@ public virtual System.ClientModel.ClientResult StillConvenient(System.ClientMode
         /// </list>
         /// </summary>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<System.ClientModel.ClientResult> StillConvenientAsync(System.ClientModel.Primitives.RequestOptions options)
+        public virtual async Task<ClientResult> StillConvenientAsync(RequestOptions options)
         {
-            using System.ClientModel.Primitives.PipelineMessage message = CreateStillConvenientRequest(options);
-            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using PipelineMessage message = CreateStillConvenientRequest(options);
+            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> When set protocol false and convenient true, the convenient method should be generated even it has the same signature as protocol one. </summary>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual System.ClientModel.ClientResult StillConvenient()
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual ClientResult StillConvenient()
         {
             return StillConvenient(null);
         }
 
         /// <summary> When set protocol false and convenient true, the convenient method should be generated even it has the same signature as protocol one. </summary>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<System.ClientModel.ClientResult> StillConvenientAsync()
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<ClientResult> StillConvenientAsync()
         {
             return await StillConvenientAsync(null).ConfigureAwait(false);
         }
@@ -1111,14 +1111,14 @@ public virtual System.ClientModel.ClientResult StillConvenient()
         /// <param name="id"></param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="id"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual System.ClientModel.ClientResult HeadAsBoolean(string id, System.ClientModel.Primitives.RequestOptions options)
+        public virtual ClientResult HeadAsBoolean(string id, RequestOptions options)
         {
             Argument.AssertNotNull(id, nameof(id));
 
-            using System.ClientModel.Primitives.PipelineMessage message = CreateHeadAsBooleanRequest(id, options);
-            return System.ClientModel.ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
+            using PipelineMessage message = CreateHeadAsBooleanRequest(id, options);
+            return ClientResult.FromResponse(Pipeline.ProcessMessage(message, options));
         }
 
         /// <summary>
@@ -1132,21 +1132,21 @@ public virtual System.ClientModel.ClientResult HeadAsBoolean(string id, System.C
         /// <param name="id"></param>
         /// <param name="options"> The request options, which can override default behaviors of the client pipeline on a per-call basis. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="id"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         /// <returns> The response returned from the service. </returns>
-        public virtual async Task<System.ClientModel.ClientResult> HeadAsBooleanAsync(string id, System.ClientModel.Primitives.RequestOptions options)
+        public virtual async Task<ClientResult> HeadAsBooleanAsync(string id, RequestOptions options)
         {
             Argument.AssertNotNull(id, nameof(id));
 
-            using System.ClientModel.Primitives.PipelineMessage message = CreateHeadAsBooleanRequest(id, options);
-            return System.ClientModel.ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
+            using PipelineMessage message = CreateHeadAsBooleanRequest(id, options);
+            return ClientResult.FromResponse(await Pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false));
         }
 
         /// <summary> head as boolean. </summary>
         /// <param name="id"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="id"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual System.ClientModel.ClientResult HeadAsBoolean(string id)
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual ClientResult HeadAsBoolean(string id)
         {
             Argument.AssertNotNull(id, nameof(id));
 
@@ -1156,8 +1156,8 @@ public virtual System.ClientModel.ClientResult HeadAsBoolean(string id)
         /// <summary> head as boolean. </summary>
         /// <param name="id"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="id"/> is null. </exception>
-        /// <exception cref="System.ClientModel.ClientResultException"> Service returned a non-success status code. </exception>
-        public virtual async Task<System.ClientModel.ClientResult> HeadAsBooleanAsync(string id)
+        /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
+        public virtual async Task<ClientResult> HeadAsBooleanAsync(string id)
         {
             Argument.AssertNotNull(id, nameof(id));
 
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClientOptions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClientOptions.cs
index e6c0941576d93..902ba6acf9826 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClientOptions.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClientOptions.cs
@@ -11,7 +11,7 @@
 namespace BasicTypeSpec
 {
     /// <summary> Client options for <see cref="BasicTypeSpecClient"/>. </summary>
-    public partial class BasicTypeSpecClientOptions : System.ClientModel.Primitives.ClientPipelineOptions
+    public partial class BasicTypeSpecClientOptions : ClientPipelineOptions
     {
         private const ServiceVersion LatestVersion = ServiceVersion.V2024_08_16_Preview;
 
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecModelFactory.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecModelFactory.cs
index 91edba445d8b6..d1f46eb445046 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecModelFactory.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecModelFactory.cs
@@ -30,7 +30,7 @@ public static partial class BasicTypeSpecModelFactory
         /// <param name="optionalNullableList"></param>
         /// <param name="requiredNullableList"></param>
         /// <returns> A new <see cref="Models.Thing"/> instance for mocking. </returns>
-        public static Thing Thing(string name = default, System.BinaryData requiredUnion = default, ThingRequiredLiteralString requiredLiteralString = default, ThingRequiredLiteralInt requiredLiteralInt = default, ThingRequiredLiteralFloat requiredLiteralFloat = default, bool requiredLiteralBool = default, ThingOptionalLiteralString? optionalLiteralString = default, ThingOptionalLiteralInt? optionalLiteralInt = default, ThingOptionalLiteralFloat? optionalLiteralFloat = default, bool? optionalLiteralBool = default, string requiredBadDescription = default, IEnumerable<int> optionalNullableList = default, IEnumerable<int> requiredNullableList = default)
+        public static Thing Thing(string name = default, BinaryData requiredUnion = default, ThingRequiredLiteralString requiredLiteralString = default, ThingRequiredLiteralInt requiredLiteralInt = default, ThingRequiredLiteralFloat requiredLiteralFloat = default, bool requiredLiteralBool = default, ThingOptionalLiteralString? optionalLiteralString = default, ThingOptionalLiteralInt? optionalLiteralInt = default, ThingOptionalLiteralFloat? optionalLiteralFloat = default, bool? optionalLiteralBool = default, string requiredBadDescription = default, IEnumerable<int> optionalNullableList = default, IEnumerable<int> requiredNullableList = default)
         {
             optionalNullableList ??= new ChangeTrackingList<int>();
             requiredNullableList ??= new ChangeTrackingList<int>();
@@ -78,7 +78,7 @@ public static Thing Thing(string name = default, System.BinaryData requiredUnion
         /// <param name="modelWithRequiredNullable"></param>
         /// <param name="requiredBytes"></param>
         /// <returns> A new <see cref="Models.RoundTripModel"/> instance for mocking. </returns>
-        public static RoundTripModel RoundTripModel(string requiredString = default, int requiredInt = default, IEnumerable<StringFixedEnum> requiredCollection = default, IDictionary<string, StringExtensibleEnum> requiredDictionary = default, Thing requiredModel = default, IntExtensibleEnum? intExtensibleEnum = default, IEnumerable<IntExtensibleEnum> intExtensibleEnumCollection = default, FloatExtensibleEnum? floatExtensibleEnum = default, FloatExtensibleEnumWithIntValue? floatExtensibleEnumWithIntValue = default, IEnumerable<FloatExtensibleEnum> floatExtensibleEnumCollection = default, FloatFixedEnum? floatFixedEnum = default, FloatFixedEnumWithIntValue? floatFixedEnumWithIntValue = default, IEnumerable<FloatFixedEnum> floatFixedEnumCollection = default, IntFixedEnum? intFixedEnum = default, IEnumerable<IntFixedEnum> intFixedEnumCollection = default, StringFixedEnum? stringFixedEnum = default, System.BinaryData requiredUnknown = default, System.BinaryData optionalUnknown = default, IDictionary<string, System.BinaryData> requiredRecordUnknown = default, IDictionary<string, System.BinaryData> optionalRecordUnknown = default, IReadOnlyDictionary<string, System.BinaryData> readOnlyRequiredRecordUnknown = default, IReadOnlyDictionary<string, System.BinaryData> readOnlyOptionalRecordUnknown = default, ModelWithRequiredNullableProperties modelWithRequiredNullable = default, System.BinaryData requiredBytes = default)
+        public static RoundTripModel RoundTripModel(string requiredString = default, int requiredInt = default, IEnumerable<StringFixedEnum> requiredCollection = default, IDictionary<string, StringExtensibleEnum> requiredDictionary = default, Thing requiredModel = default, IntExtensibleEnum? intExtensibleEnum = default, IEnumerable<IntExtensibleEnum> intExtensibleEnumCollection = default, FloatExtensibleEnum? floatExtensibleEnum = default, FloatExtensibleEnumWithIntValue? floatExtensibleEnumWithIntValue = default, IEnumerable<FloatExtensibleEnum> floatExtensibleEnumCollection = default, FloatFixedEnum? floatFixedEnum = default, FloatFixedEnumWithIntValue? floatFixedEnumWithIntValue = default, IEnumerable<FloatFixedEnum> floatFixedEnumCollection = default, IntFixedEnum? intFixedEnum = default, IEnumerable<IntFixedEnum> intFixedEnumCollection = default, StringFixedEnum? stringFixedEnum = default, BinaryData requiredUnknown = default, BinaryData optionalUnknown = default, IDictionary<string, BinaryData> requiredRecordUnknown = default, IDictionary<string, BinaryData> optionalRecordUnknown = default, IReadOnlyDictionary<string, BinaryData> readOnlyRequiredRecordUnknown = default, IReadOnlyDictionary<string, BinaryData> readOnlyOptionalRecordUnknown = default, ModelWithRequiredNullableProperties modelWithRequiredNullable = default, BinaryData requiredBytes = default)
         {
             requiredCollection ??= new ChangeTrackingList<StringFixedEnum>();
             requiredDictionary ??= new ChangeTrackingDictionary<string, StringExtensibleEnum>();
@@ -86,10 +86,10 @@ public static RoundTripModel RoundTripModel(string requiredString = default, int
             floatExtensibleEnumCollection ??= new ChangeTrackingList<FloatExtensibleEnum>();
             floatFixedEnumCollection ??= new ChangeTrackingList<FloatFixedEnum>();
             intFixedEnumCollection ??= new ChangeTrackingList<IntFixedEnum>();
-            requiredRecordUnknown ??= new ChangeTrackingDictionary<string, System.BinaryData>();
-            optionalRecordUnknown ??= new ChangeTrackingDictionary<string, System.BinaryData>();
-            readOnlyRequiredRecordUnknown ??= new ChangeTrackingDictionary<string, System.BinaryData>();
-            readOnlyOptionalRecordUnknown ??= new ChangeTrackingDictionary<string, System.BinaryData>();
+            requiredRecordUnknown ??= new ChangeTrackingDictionary<string, BinaryData>();
+            optionalRecordUnknown ??= new ChangeTrackingDictionary<string, BinaryData>();
+            readOnlyRequiredRecordUnknown ??= new ChangeTrackingDictionary<string, BinaryData>();
+            readOnlyOptionalRecordUnknown ??= new ChangeTrackingDictionary<string, BinaryData>();
 
             return new RoundTripModel(
                 requiredString,
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ClientPipelineExtensions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ClientPipelineExtensions.cs
index ec1f11974e061..d9378b66796ea 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ClientPipelineExtensions.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ClientPipelineExtensions.cs
@@ -13,57 +13,57 @@ namespace BasicTypeSpec
 {
     internal static partial class ClientPipelineExtensions
     {
-        public static async ValueTask<System.ClientModel.Primitives.PipelineResponse> ProcessMessageAsync(this System.ClientModel.Primitives.ClientPipeline pipeline, System.ClientModel.Primitives.PipelineMessage message, System.ClientModel.Primitives.RequestOptions options)
+        public static async ValueTask<PipelineResponse> ProcessMessageAsync(this ClientPipeline pipeline, PipelineMessage message, RequestOptions options)
         {
             await pipeline.SendAsync(message).ConfigureAwait(false);
 
-            if (message.Response.IsError && (options?.ErrorOptions & System.ClientModel.Primitives.ClientErrorBehaviors.NoThrow) != System.ClientModel.Primitives.ClientErrorBehaviors.NoThrow)
+            if (message.Response.IsError && (options?.ErrorOptions & ClientErrorBehaviors.NoThrow) != ClientErrorBehaviors.NoThrow)
             {
-                throw await System.ClientModel.ClientResultException.CreateAsync(message.Response).ConfigureAwait(false);
+                throw await ClientResultException.CreateAsync(message.Response).ConfigureAwait(false);
             }
 
-            System.ClientModel.Primitives.PipelineResponse response = message.BufferResponse ? message.Response : message.ExtractResponse();
+            PipelineResponse response = message.BufferResponse ? message.Response : message.ExtractResponse();
             return response;
         }
 
-        public static System.ClientModel.Primitives.PipelineResponse ProcessMessage(this System.ClientModel.Primitives.ClientPipeline pipeline, System.ClientModel.Primitives.PipelineMessage message, System.ClientModel.Primitives.RequestOptions options)
+        public static PipelineResponse ProcessMessage(this ClientPipeline pipeline, PipelineMessage message, RequestOptions options)
         {
             pipeline.Send(message);
 
-            if (message.Response.IsError && (options?.ErrorOptions & System.ClientModel.Primitives.ClientErrorBehaviors.NoThrow) != System.ClientModel.Primitives.ClientErrorBehaviors.NoThrow)
+            if (message.Response.IsError && (options?.ErrorOptions & ClientErrorBehaviors.NoThrow) != ClientErrorBehaviors.NoThrow)
             {
-                throw new System.ClientModel.ClientResultException(message.Response);
+                throw new ClientResultException(message.Response);
             }
 
-            System.ClientModel.Primitives.PipelineResponse response = message.BufferResponse ? message.Response : message.ExtractResponse();
+            PipelineResponse response = message.BufferResponse ? message.Response : message.ExtractResponse();
             return response;
         }
 
-        public static async ValueTask<System.ClientModel.ClientResult<bool>> ProcessHeadAsBoolMessageAsync(this System.ClientModel.Primitives.ClientPipeline pipeline, System.ClientModel.Primitives.PipelineMessage message, System.ClientModel.Primitives.RequestOptions options)
+        public static async ValueTask<ClientResult<bool>> ProcessHeadAsBoolMessageAsync(this ClientPipeline pipeline, PipelineMessage message, RequestOptions options)
         {
-            System.ClientModel.Primitives.PipelineResponse response = await pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false);
+            PipelineResponse response = await pipeline.ProcessMessageAsync(message, options).ConfigureAwait(false);
             switch (response.Status)
             {
                 case >= 200 and < 300:
-                    return System.ClientModel.ClientResult.FromValue<bool>(true, response);
+                    return ClientResult.FromValue(true, response);
                 case >= 400 and < 500:
-                    return System.ClientModel.ClientResult.FromValue<bool>(false, response);
+                    return ClientResult.FromValue(false, response);
                 default:
-                    return new ErrorResult<bool>(response, new System.ClientModel.ClientResultException(response));
+                    return new ErrorResult<bool>(response, new ClientResultException(response));
             }
         }
 
-        public static System.ClientModel.ClientResult<bool> ProcessHeadAsBoolMessage(this System.ClientModel.Primitives.ClientPipeline pipeline, System.ClientModel.Primitives.PipelineMessage message, System.ClientModel.Primitives.RequestOptions options)
+        public static ClientResult<bool> ProcessHeadAsBoolMessage(this ClientPipeline pipeline, PipelineMessage message, RequestOptions options)
         {
-            System.ClientModel.Primitives.PipelineResponse response = pipeline.ProcessMessage(message, options);
+            PipelineResponse response = pipeline.ProcessMessage(message, options);
             switch (response.Status)
             {
                 case >= 200 and < 300:
-                    return System.ClientModel.ClientResult.FromValue<bool>(true, response);
+                    return ClientResult.FromValue(true, response);
                 case >= 400 and < 500:
-                    return System.ClientModel.ClientResult.FromValue<bool>(false, response);
+                    return ClientResult.FromValue(false, response);
                 default:
-                    return new ErrorResult<bool>(response, new System.ClientModel.ClientResultException(response));
+                    return new ErrorResult<bool>(response, new ClientResultException(response));
             }
         }
     }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ClientUriBuilder.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ClientUriBuilder.cs
index 79aba0986caa1..a887f440ebe9b 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ClientUriBuilder.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ClientUriBuilder.cs
@@ -14,7 +14,7 @@ namespace BasicTypeSpec
 {
     internal partial class ClientUriBuilder
     {
-        private System.UriBuilder _uriBuilder;
+        private UriBuilder _uriBuilder;
         private StringBuilder _pathBuilder;
         private StringBuilder _queryBuilder;
 
@@ -22,15 +22,15 @@ public ClientUriBuilder()
         {
         }
 
-        private System.UriBuilder UriBuilder => _uriBuilder  ??=  new System.UriBuilder();
+        private UriBuilder UriBuilder => _uriBuilder  ??=  new UriBuilder();
 
         private StringBuilder PathBuilder => _pathBuilder  ??=  new StringBuilder(UriBuilder.Path);
 
         private StringBuilder QueryBuilder => _queryBuilder  ??=  new StringBuilder(UriBuilder.Query);
 
-        public void Reset(System.Uri uri)
+        public void Reset(Uri uri)
         {
-            _uriBuilder = new System.UriBuilder(uri);
+            _uriBuilder = new UriBuilder(uri);
             _pathBuilder = new StringBuilder(UriBuilder.Path);
             _queryBuilder = new StringBuilder(UriBuilder.Query);
         }
@@ -39,7 +39,7 @@ public void AppendPath(string value, bool escape)
         {
             if (escape)
             {
-                value = System.Uri.EscapeDataString(value);
+                value = Uri.EscapeDataString(value);
             }
             if (PathBuilder.Length > 0 && PathBuilder[PathBuilder.Length - 1] == '/' && value[0] == '/')
             {
@@ -77,7 +77,7 @@ public void AppendQuery(string name, string value, bool escape)
             }
             if (escape)
             {
-                value = System.Uri.EscapeDataString(value);
+                value = Uri.EscapeDataString(value);
             }
             QueryBuilder.Append(name);
             QueryBuilder.Append('=');
@@ -118,7 +118,7 @@ public void AppendQueryDelimited<T>(string name, IEnumerable<T> value, string de
             AppendQuery(name, string.Join(delimiter, stringValues), escape);
         }
 
-        public System.Uri ToUri()
+        public Uri ToUri()
         {
             if (_pathBuilder != null)
             {
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ErrorResult.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ErrorResult.cs
index b000b471cc214..99d36a31e528f 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ErrorResult.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ErrorResult.cs
@@ -10,12 +10,12 @@
 
 namespace BasicTypeSpec
 {
-    internal partial class ErrorResult<T> : System.ClientModel.ClientResult<T>
+    internal partial class ErrorResult<T> : ClientResult<T>
     {
-        private readonly System.ClientModel.Primitives.PipelineResponse _response;
-        private readonly System.ClientModel.ClientResultException _exception;
+        private readonly PipelineResponse _response;
+        private readonly ClientResultException _exception;
 
-        public ErrorResult(System.ClientModel.Primitives.PipelineResponse response, System.ClientModel.ClientResultException exception) : base(default, response)
+        public ErrorResult(PipelineResponse response, ClientResultException exception) : base(default, response)
         {
             _response = response;
             _exception = exception;
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ModelSerializationExtensions.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ModelSerializationExtensions.cs
index f22c27582e7fd..1cb0c768c47c5 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ModelSerializationExtensions.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/ModelSerializationExtensions.cs
@@ -16,15 +16,15 @@ namespace BasicTypeSpec
 {
     internal static partial class ModelSerializationExtensions
     {
-        internal static readonly System.ClientModel.Primitives.ModelReaderWriterOptions WireOptions = new System.ClientModel.Primitives.ModelReaderWriterOptions("W");
+        internal static readonly ModelReaderWriterOptions WireOptions = new ModelReaderWriterOptions("W");
 
-        public static object GetObject(this System.Text.Json.JsonElement element)
+        public static object GetObject(this JsonElement element)
         {
             switch (element.ValueKind)
             {
-                case System.Text.Json.JsonValueKind.String:
+                case JsonValueKind.String:
                     return element.GetString();
-                case System.Text.Json.JsonValueKind.Number:
+                case JsonValueKind.Number:
                     if (element.TryGetInt32(out int intValue))
                     {
                         return intValue;
@@ -34,21 +34,21 @@ public static object GetObject(this System.Text.Json.JsonElement element)
                         return longValue;
                     }
                     return element.GetDouble();
-                case System.Text.Json.JsonValueKind.True:
+                case JsonValueKind.True:
                     return true;
-                case System.Text.Json.JsonValueKind.False:
+                case JsonValueKind.False:
                     return false;
-                case System.Text.Json.JsonValueKind.Undefined:
-                case System.Text.Json.JsonValueKind.Null:
+                case JsonValueKind.Undefined:
+                case JsonValueKind.Null:
                     return null;
-                case System.Text.Json.JsonValueKind.Object:
+                case JsonValueKind.Object:
                     Dictionary<string, object> dictionary = new Dictionary<string, object>();
                     foreach (var jsonProperty in element.EnumerateObject())
                     {
                         dictionary.Add(jsonProperty.Name, jsonProperty.Value.GetObject());
                     }
                     return dictionary;
-                case System.Text.Json.JsonValueKind.Array:
+                case JsonValueKind.Array:
                     List<object> list = new List<object>();
                     foreach (var item in element.EnumerateArray())
                     {
@@ -60,9 +60,9 @@ public static object GetObject(this System.Text.Json.JsonElement element)
             }
         }
 
-        public static byte[] GetBytesFromBase64(this System.Text.Json.JsonElement element, string format)
+        public static byte[] GetBytesFromBase64(this JsonElement element, string format)
         {
-            if (element.ValueKind == System.Text.Json.JsonValueKind.Null)
+            if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
@@ -75,17 +75,17 @@ public static byte[] GetBytesFromBase64(this System.Text.Json.JsonElement elemen
             };
         }
 
-        public static DateTimeOffset GetDateTimeOffset(this System.Text.Json.JsonElement element, string format) => format switch
+        public static DateTimeOffset GetDateTimeOffset(this JsonElement element, string format) => format switch
         {
-            "U" when element.ValueKind == System.Text.Json.JsonValueKind.Number => DateTimeOffset.FromUnixTimeSeconds(element.GetInt64()),
+            "U" when element.ValueKind == JsonValueKind.Number => DateTimeOffset.FromUnixTimeSeconds(element.GetInt64()),
             _ => TypeFormatters.ParseDateTimeOffset(element.GetString(), format)
         };
 
-        public static TimeSpan GetTimeSpan(this System.Text.Json.JsonElement element, string format) => TypeFormatters.ParseTimeSpan(element.GetString(), format);
+        public static TimeSpan GetTimeSpan(this JsonElement element, string format) => TypeFormatters.ParseTimeSpan(element.GetString(), format);
 
-        public static char GetChar(this System.Text.Json.JsonElement element)
+        public static char GetChar(this JsonElement element)
         {
-            if (element.ValueKind == System.Text.Json.JsonValueKind.String)
+            if (element.ValueKind == JsonValueKind.String)
             {
                 string text = element.GetString();
                 if (text == null || text.Length != 1)
@@ -101,12 +101,12 @@ public static char GetChar(this System.Text.Json.JsonElement element)
         }
 
         [Conditional("DEBUG")]
-        public static void ThrowNonNullablePropertyIsNull(this System.Text.Json.JsonProperty @property)
+        public static void ThrowNonNullablePropertyIsNull(this JsonProperty @property)
         {
-            throw new System.Text.Json.JsonException($"A property '{@property.Name}' defined as non-nullable but received as null from the service. This exception only happens in DEBUG builds of the library and would be ignored in the release build");
+            throw new JsonException($"A property '{@property.Name}' defined as non-nullable but received as null from the service. This exception only happens in DEBUG builds of the library and would be ignored in the release build");
         }
 
-        public static string GetRequiredString(this System.Text.Json.JsonElement element)
+        public static string GetRequiredString(this JsonElement element)
         {
             string value = element.GetString();
             if (value == null)
@@ -116,27 +116,27 @@ public static string GetRequiredString(this System.Text.Json.JsonElement element
             return value;
         }
 
-        public static void WriteStringValue(this System.Text.Json.Utf8JsonWriter writer, DateTimeOffset value, string format)
+        public static void WriteStringValue(this Utf8JsonWriter writer, DateTimeOffset value, string format)
         {
             writer.WriteStringValue(TypeFormatters.ToString(value, format));
         }
 
-        public static void WriteStringValue(this System.Text.Json.Utf8JsonWriter writer, DateTime value, string format)
+        public static void WriteStringValue(this Utf8JsonWriter writer, DateTime value, string format)
         {
             writer.WriteStringValue(TypeFormatters.ToString(value, format));
         }
 
-        public static void WriteStringValue(this System.Text.Json.Utf8JsonWriter writer, TimeSpan value, string format)
+        public static void WriteStringValue(this Utf8JsonWriter writer, TimeSpan value, string format)
         {
             writer.WriteStringValue(TypeFormatters.ToString(value, format));
         }
 
-        public static void WriteStringValue(this System.Text.Json.Utf8JsonWriter writer, char value)
+        public static void WriteStringValue(this Utf8JsonWriter writer, char value)
         {
             writer.WriteStringValue(value.ToString(CultureInfo.InvariantCulture));
         }
 
-        public static void WriteBase64StringValue(this System.Text.Json.Utf8JsonWriter writer, byte[] value, string format)
+        public static void WriteBase64StringValue(this Utf8JsonWriter writer, byte[] value, string format)
         {
             if (value == null)
             {
@@ -156,7 +156,7 @@ public static void WriteBase64StringValue(this System.Text.Json.Utf8JsonWriter w
             }
         }
 
-        public static void WriteNumberValue(this System.Text.Json.Utf8JsonWriter writer, DateTimeOffset value, string format)
+        public static void WriteNumberValue(this Utf8JsonWriter writer, DateTimeOffset value, string format)
         {
             if (format != "U")
             {
@@ -165,23 +165,23 @@ public static void WriteNumberValue(this System.Text.Json.Utf8JsonWriter writer,
             writer.WriteNumberValue(value.ToUnixTimeSeconds());
         }
 
-        public static void WriteObjectValue<T>(this System.Text.Json.Utf8JsonWriter writer, T value, System.ClientModel.Primitives.ModelReaderWriterOptions options = (System.ClientModel.Primitives.ModelReaderWriterOptions)null)
+        public static void WriteObjectValue<T>(this Utf8JsonWriter writer, T value, ModelReaderWriterOptions options = null)
         {
             switch (value)
             {
                 case null:
                     writer.WriteNullValue();
                     break;
-                case System.ClientModel.Primitives.IJsonModel<T> jsonModel:
+                case IJsonModel<T> jsonModel:
                     jsonModel.Write(writer, options ?? WireOptions);
                     break;
                 case byte[] bytes:
                     writer.WriteBase64StringValue(bytes);
                     break;
-                case System.BinaryData bytes0:
+                case BinaryData bytes0:
                     writer.WriteBase64StringValue(bytes0);
                     break;
-                case System.Text.Json.JsonElement json:
+                case JsonElement json:
                     json.WriteTo(writer);
                     break;
                 case int i:
@@ -246,7 +246,7 @@ public static void WriteObjectValue<T>(this System.Text.Json.Utf8JsonWriter writ
             }
         }
 
-        public static void WriteObjectValue(this System.Text.Json.Utf8JsonWriter writer, object value, System.ClientModel.Primitives.ModelReaderWriterOptions options = (System.ClientModel.Primitives.ModelReaderWriterOptions)null)
+        public static void WriteObjectValue(this Utf8JsonWriter writer, object value, ModelReaderWriterOptions options = null)
         {
             writer.WriteObjectValue<object>(value, options);
         }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/Optional.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/Optional.cs
index d7a4c7cc3e8b4..34ce441ed6120 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/Optional.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/Optional.cs
@@ -43,9 +43,9 @@ public static bool IsDefined(string value)
             return value != null;
         }
 
-        public static bool IsDefined(System.Text.Json.JsonElement value)
+        public static bool IsDefined(JsonElement value)
         {
-            return value.ValueKind != System.Text.Json.JsonValueKind.Undefined;
+            return value.ValueKind != JsonValueKind.Undefined;
         }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/TypeFormatters.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/TypeFormatters.cs
index 13fc48b8b0eed..6cb37b3a0ad12 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/TypeFormatters.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Internal/TypeFormatters.cs
@@ -146,7 +146,7 @@ public static byte[] FromBase64UrlString(string value)
             TimeSpan timeSpan when format != null => ToString(timeSpan, format),
             TimeSpan timeSpan0 => System.Xml.XmlConvert.ToString(timeSpan0),
             Guid guid => guid.ToString(),
-            System.BinaryData binaryData => TypeFormatters.ConvertToString(binaryData.ToArray(), format),
+            BinaryData binaryData => ConvertToString(binaryData.ToArray(), format),
             _ => value.ToString()
         };
     }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Friend.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Friend.Serialization.cs
index 89d35f5ee5343..7d1bd5d9d46a5 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Friend.Serialization.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Friend.Serialization.cs
@@ -15,13 +15,13 @@
 namespace BasicTypeSpec.Models
 {
     /// <summary></summary>
-    public partial class Friend : System.ClientModel.Primitives.IJsonModel<Friend>
+    public partial class Friend : IJsonModel<Friend>
     {
         internal Friend()
         {
         }
 
-        void System.ClientModel.Primitives.IJsonModel<Friend>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        void IJsonModel<Friend>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -30,9 +30,9 @@ void System.ClientModel.Primitives.IJsonModel<Friend>.Write(System.Text.Json.Utf
 
         /// <param name="writer"> The JSON writer. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<Friend>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<Friend>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(Friend)} does not support writing '{format}' format.");
@@ -47,38 +47,38 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer
 #if NET6_0_OR_GREATER
                     writer.WriteRawValue(item.Value);
 #else
-                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(item.Value))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
-                        System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
+                        JsonSerializer.Serialize(writer, document.RootElement);
                     }
 #endif
                 }
             }
         }
 
-        Friend System.ClientModel.Primitives.IJsonModel<Friend>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+        Friend IJsonModel<Friend>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
 
         /// <param name="reader"> The JSON reader. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual Friend JsonModelCreateCore(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual Friend JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<Friend>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<Friend>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(Friend)} does not support reading '{format}' format.");
             }
-            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.ParseValue(ref reader);
-            return Friend.DeserializeFriend(document.RootElement, options);
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeFriend(document.RootElement, options);
         }
 
-        internal static Friend DeserializeFriend(System.Text.Json.JsonElement element, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        internal static Friend DeserializeFriend(JsonElement element, ModelReaderWriterOptions options)
         {
-            if (element.ValueKind == System.Text.Json.JsonValueKind.Null)
+            if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
             string name = default;
-            IDictionary<string, System.BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, System.BinaryData>();
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
             foreach (var prop in element.EnumerateObject())
             {
                 if (prop.NameEquals("name"u8))
@@ -88,60 +88,60 @@ internal static Friend DeserializeFriend(System.Text.Json.JsonElement element, S
                 }
                 if (options.Format != "W")
                 {
-                    additionalBinaryDataProperties.Add(prop.Name, System.BinaryData.FromString(prop.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
             return new Friend(name, additionalBinaryDataProperties);
         }
 
-        System.BinaryData System.ClientModel.Primitives.IPersistableModel<Friend>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
+        BinaryData IPersistableModel<Friend>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual System.BinaryData PersistableModelWriteCore(System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<Friend>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<Friend>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    return System.ClientModel.Primitives.ModelReaderWriter.Write(this, options);
+                    return ModelReaderWriter.Write(this, options);
                 default:
                     throw new FormatException($"The model {nameof(Friend)} does not support writing '{options.Format}' format.");
             }
         }
 
-        Friend System.ClientModel.Primitives.IPersistableModel<Friend>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
+        Friend IPersistableModel<Friend>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
         /// <param name="data"> The data to parse. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual Friend PersistableModelCreateCore(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual Friend PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<Friend>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<Friend>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(data))
+                    using (JsonDocument document = JsonDocument.Parse(data))
                     {
-                        return Friend.DeserializeFriend(document.RootElement, options);
+                        return DeserializeFriend(document.RootElement, options);
                     }
                 default:
                     throw new FormatException($"The model {nameof(Friend)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string System.ClientModel.Primitives.IPersistableModel<Friend>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<Friend>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
-        /// <param name="friend"> The <see cref="Friend"/> to serialize into <see cref="System.ClientModel.BinaryContent"/>. </param>
+        /// <param name="friend"> The <see cref="Friend"/> to serialize into <see cref="BinaryContent"/>. </param>
         public static implicit operator BinaryContent(Friend friend)
         {
-            return System.ClientModel.BinaryContent.Create(friend, ModelSerializationExtensions.WireOptions);
+            return BinaryContent.Create(friend, ModelSerializationExtensions.WireOptions);
         }
 
-        /// <param name="result"> The <see cref="System.ClientModel.ClientResult"/> to deserialize the <see cref="Friend"/> from. </param>
-        public static explicit operator Friend(System.ClientModel.ClientResult result)
+        /// <param name="result"> The <see cref="ClientResult"/> to deserialize the <see cref="Friend"/> from. </param>
+        public static explicit operator Friend(ClientResult result)
         {
-            using System.ClientModel.Primitives.PipelineResponse response = result.GetRawResponse();
-            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(response.Content);
-            return Friend.DeserializeFriend(document.RootElement, ModelSerializationExtensions.WireOptions);
+            using PipelineResponse response = result.GetRawResponse();
+            using JsonDocument document = JsonDocument.Parse(response.Content);
+            return DeserializeFriend(document.RootElement, ModelSerializationExtensions.WireOptions);
         }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Friend.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Friend.cs
index 9e2bf6f3e3f49..c31b434087bad 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Friend.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Friend.cs
@@ -14,14 +14,14 @@ namespace BasicTypeSpec.Models
     public partial class Friend
     {
         /// <summary> Keeps track of any properties unknown to the library. </summary>
-        private protected IDictionary<string, System.BinaryData> _additionalBinaryDataProperties;
+        private protected IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         internal Friend(string name)
         {
             Name = name;
         }
 
-        internal Friend(string name, IDictionary<string, System.BinaryData> additionalBinaryDataProperties)
+        internal Friend(string name, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             Name = name;
             _additionalBinaryDataProperties = additionalBinaryDataProperties;
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.Serialization.cs
index 9f8f31adf5f3e..a84cef90e170d 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.Serialization.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.Serialization.cs
@@ -15,13 +15,13 @@
 namespace BasicTypeSpec.Models
 {
     /// <summary></summary>
-    public partial class ModelWithRequiredNullableProperties : System.ClientModel.Primitives.IJsonModel<ModelWithRequiredNullableProperties>
+    public partial class ModelWithRequiredNullableProperties : IJsonModel<ModelWithRequiredNullableProperties>
     {
         internal ModelWithRequiredNullableProperties()
         {
         }
 
-        void System.ClientModel.Primitives.IJsonModel<ModelWithRequiredNullableProperties>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        void IJsonModel<ModelWithRequiredNullableProperties>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -30,9 +30,9 @@ void System.ClientModel.Primitives.IJsonModel<ModelWithRequiredNullablePropertie
 
         /// <param name="writer"> The JSON writer. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ModelWithRequiredNullableProperties>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<ModelWithRequiredNullableProperties>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(ModelWithRequiredNullableProperties)} does not support writing '{format}' format.");
@@ -72,45 +72,45 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer
 #if NET6_0_OR_GREATER
                     writer.WriteRawValue(item.Value);
 #else
-                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(item.Value))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
-                        System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
+                        JsonSerializer.Serialize(writer, document.RootElement);
                     }
 #endif
                 }
             }
         }
 
-        ModelWithRequiredNullableProperties System.ClientModel.Primitives.IJsonModel<ModelWithRequiredNullableProperties>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+        ModelWithRequiredNullableProperties IJsonModel<ModelWithRequiredNullableProperties>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
 
         /// <param name="reader"> The JSON reader. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual ModelWithRequiredNullableProperties JsonModelCreateCore(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual ModelWithRequiredNullableProperties JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ModelWithRequiredNullableProperties>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<ModelWithRequiredNullableProperties>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(ModelWithRequiredNullableProperties)} does not support reading '{format}' format.");
             }
-            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.ParseValue(ref reader);
-            return ModelWithRequiredNullableProperties.DeserializeModelWithRequiredNullableProperties(document.RootElement, options);
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeModelWithRequiredNullableProperties(document.RootElement, options);
         }
 
-        internal static ModelWithRequiredNullableProperties DeserializeModelWithRequiredNullableProperties(System.Text.Json.JsonElement element, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        internal static ModelWithRequiredNullableProperties DeserializeModelWithRequiredNullableProperties(JsonElement element, ModelReaderWriterOptions options)
         {
-            if (element.ValueKind == System.Text.Json.JsonValueKind.Null)
+            if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
             int? requiredNullablePrimitive = default;
             StringExtensibleEnum? requiredExtensibleEnum = default;
             StringFixedEnum? requiredFixedEnum = default;
-            IDictionary<string, System.BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, System.BinaryData>();
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
             foreach (var prop in element.EnumerateObject())
             {
                 if (prop.NameEquals("requiredNullablePrimitive"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         requiredNullablePrimitive = null;
                         continue;
@@ -120,7 +120,7 @@ internal static ModelWithRequiredNullableProperties DeserializeModelWithRequired
                 }
                 if (prop.NameEquals("requiredExtensibleEnum"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         requiredExtensibleEnum = null;
                         continue;
@@ -130,7 +130,7 @@ internal static ModelWithRequiredNullableProperties DeserializeModelWithRequired
                 }
                 if (prop.NameEquals("requiredFixedEnum"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         requiredFixedEnum = null;
                         continue;
@@ -140,60 +140,60 @@ internal static ModelWithRequiredNullableProperties DeserializeModelWithRequired
                 }
                 if (options.Format != "W")
                 {
-                    additionalBinaryDataProperties.Add(prop.Name, System.BinaryData.FromString(prop.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
             return new ModelWithRequiredNullableProperties(requiredNullablePrimitive, requiredExtensibleEnum, requiredFixedEnum, additionalBinaryDataProperties);
         }
 
-        System.BinaryData System.ClientModel.Primitives.IPersistableModel<ModelWithRequiredNullableProperties>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
+        BinaryData IPersistableModel<ModelWithRequiredNullableProperties>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual System.BinaryData PersistableModelWriteCore(System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ModelWithRequiredNullableProperties>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<ModelWithRequiredNullableProperties>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    return System.ClientModel.Primitives.ModelReaderWriter.Write(this, options);
+                    return ModelReaderWriter.Write(this, options);
                 default:
                     throw new FormatException($"The model {nameof(ModelWithRequiredNullableProperties)} does not support writing '{options.Format}' format.");
             }
         }
 
-        ModelWithRequiredNullableProperties System.ClientModel.Primitives.IPersistableModel<ModelWithRequiredNullableProperties>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
+        ModelWithRequiredNullableProperties IPersistableModel<ModelWithRequiredNullableProperties>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
         /// <param name="data"> The data to parse. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual ModelWithRequiredNullableProperties PersistableModelCreateCore(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual ModelWithRequiredNullableProperties PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ModelWithRequiredNullableProperties>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<ModelWithRequiredNullableProperties>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(data))
+                    using (JsonDocument document = JsonDocument.Parse(data))
                     {
-                        return ModelWithRequiredNullableProperties.DeserializeModelWithRequiredNullableProperties(document.RootElement, options);
+                        return DeserializeModelWithRequiredNullableProperties(document.RootElement, options);
                     }
                 default:
                     throw new FormatException($"The model {nameof(ModelWithRequiredNullableProperties)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string System.ClientModel.Primitives.IPersistableModel<ModelWithRequiredNullableProperties>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<ModelWithRequiredNullableProperties>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
-        /// <param name="modelWithRequiredNullableProperties"> The <see cref="ModelWithRequiredNullableProperties"/> to serialize into <see cref="System.ClientModel.BinaryContent"/>. </param>
+        /// <param name="modelWithRequiredNullableProperties"> The <see cref="ModelWithRequiredNullableProperties"/> to serialize into <see cref="BinaryContent"/>. </param>
         public static implicit operator BinaryContent(ModelWithRequiredNullableProperties modelWithRequiredNullableProperties)
         {
-            return System.ClientModel.BinaryContent.Create(modelWithRequiredNullableProperties, ModelSerializationExtensions.WireOptions);
+            return BinaryContent.Create(modelWithRequiredNullableProperties, ModelSerializationExtensions.WireOptions);
         }
 
-        /// <param name="result"> The <see cref="System.ClientModel.ClientResult"/> to deserialize the <see cref="ModelWithRequiredNullableProperties"/> from. </param>
-        public static explicit operator ModelWithRequiredNullableProperties(System.ClientModel.ClientResult result)
+        /// <param name="result"> The <see cref="ClientResult"/> to deserialize the <see cref="ModelWithRequiredNullableProperties"/> from. </param>
+        public static explicit operator ModelWithRequiredNullableProperties(ClientResult result)
         {
-            using System.ClientModel.Primitives.PipelineResponse response = result.GetRawResponse();
-            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(response.Content);
-            return ModelWithRequiredNullableProperties.DeserializeModelWithRequiredNullableProperties(document.RootElement, ModelSerializationExtensions.WireOptions);
+            using PipelineResponse response = result.GetRawResponse();
+            using JsonDocument document = JsonDocument.Parse(response.Content);
+            return DeserializeModelWithRequiredNullableProperties(document.RootElement, ModelSerializationExtensions.WireOptions);
         }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.cs
index cfc394e7edbec..6900f22f7b014 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.cs
@@ -14,7 +14,7 @@ namespace BasicTypeSpec.Models
     public partial class ModelWithRequiredNullableProperties
     {
         /// <summary> Keeps track of any properties unknown to the library. </summary>
-        private protected IDictionary<string, System.BinaryData> _additionalBinaryDataProperties;
+        private protected IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="ModelWithRequiredNullableProperties"/>. </summary>
         /// <param name="requiredNullablePrimitive"></param>
@@ -27,7 +27,7 @@ public ModelWithRequiredNullableProperties(int? requiredNullablePrimitive, Strin
             RequiredFixedEnum = requiredFixedEnum;
         }
 
-        internal ModelWithRequiredNullableProperties(int? requiredNullablePrimitive, StringExtensibleEnum? requiredExtensibleEnum, StringFixedEnum? requiredFixedEnum, IDictionary<string, System.BinaryData> additionalBinaryDataProperties)
+        internal ModelWithRequiredNullableProperties(int? requiredNullablePrimitive, StringExtensibleEnum? requiredExtensibleEnum, StringFixedEnum? requiredFixedEnum, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             RequiredNullablePrimitive = requiredNullablePrimitive;
             RequiredExtensibleEnum = requiredExtensibleEnum;
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedModel.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedModel.Serialization.cs
index 07d103bdaa1d0..519e2c3d1a946 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedModel.Serialization.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedModel.Serialization.cs
@@ -15,13 +15,13 @@
 namespace BasicTypeSpec.Models
 {
     /// <summary></summary>
-    public partial class ProjectedModel : System.ClientModel.Primitives.IJsonModel<ProjectedModel>
+    public partial class ProjectedModel : IJsonModel<ProjectedModel>
     {
         internal ProjectedModel()
         {
         }
 
-        void System.ClientModel.Primitives.IJsonModel<ProjectedModel>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        void IJsonModel<ProjectedModel>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -30,9 +30,9 @@ void System.ClientModel.Primitives.IJsonModel<ProjectedModel>.Write(System.Text.
 
         /// <param name="writer"> The JSON writer. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ProjectedModel>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<ProjectedModel>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(ProjectedModel)} does not support writing '{format}' format.");
@@ -47,38 +47,38 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer
 #if NET6_0_OR_GREATER
                     writer.WriteRawValue(item.Value);
 #else
-                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(item.Value))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
-                        System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
+                        JsonSerializer.Serialize(writer, document.RootElement);
                     }
 #endif
                 }
             }
         }
 
-        ProjectedModel System.ClientModel.Primitives.IJsonModel<ProjectedModel>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+        ProjectedModel IJsonModel<ProjectedModel>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
 
         /// <param name="reader"> The JSON reader. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual ProjectedModel JsonModelCreateCore(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual ProjectedModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ProjectedModel>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<ProjectedModel>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(ProjectedModel)} does not support reading '{format}' format.");
             }
-            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.ParseValue(ref reader);
-            return ProjectedModel.DeserializeProjectedModel(document.RootElement, options);
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeProjectedModel(document.RootElement, options);
         }
 
-        internal static ProjectedModel DeserializeProjectedModel(System.Text.Json.JsonElement element, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        internal static ProjectedModel DeserializeProjectedModel(JsonElement element, ModelReaderWriterOptions options)
         {
-            if (element.ValueKind == System.Text.Json.JsonValueKind.Null)
+            if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
             string name = default;
-            IDictionary<string, System.BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, System.BinaryData>();
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
             foreach (var prop in element.EnumerateObject())
             {
                 if (prop.NameEquals("name"u8))
@@ -88,60 +88,60 @@ internal static ProjectedModel DeserializeProjectedModel(System.Text.Json.JsonEl
                 }
                 if (options.Format != "W")
                 {
-                    additionalBinaryDataProperties.Add(prop.Name, System.BinaryData.FromString(prop.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
             return new ProjectedModel(name, additionalBinaryDataProperties);
         }
 
-        System.BinaryData System.ClientModel.Primitives.IPersistableModel<ProjectedModel>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
+        BinaryData IPersistableModel<ProjectedModel>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual System.BinaryData PersistableModelWriteCore(System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ProjectedModel>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<ProjectedModel>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    return System.ClientModel.Primitives.ModelReaderWriter.Write(this, options);
+                    return ModelReaderWriter.Write(this, options);
                 default:
                     throw new FormatException($"The model {nameof(ProjectedModel)} does not support writing '{options.Format}' format.");
             }
         }
 
-        ProjectedModel System.ClientModel.Primitives.IPersistableModel<ProjectedModel>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
+        ProjectedModel IPersistableModel<ProjectedModel>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
         /// <param name="data"> The data to parse. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual ProjectedModel PersistableModelCreateCore(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual ProjectedModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ProjectedModel>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<ProjectedModel>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(data))
+                    using (JsonDocument document = JsonDocument.Parse(data))
                     {
-                        return ProjectedModel.DeserializeProjectedModel(document.RootElement, options);
+                        return DeserializeProjectedModel(document.RootElement, options);
                     }
                 default:
                     throw new FormatException($"The model {nameof(ProjectedModel)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string System.ClientModel.Primitives.IPersistableModel<ProjectedModel>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<ProjectedModel>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
-        /// <param name="projectedModel"> The <see cref="ProjectedModel"/> to serialize into <see cref="System.ClientModel.BinaryContent"/>. </param>
+        /// <param name="projectedModel"> The <see cref="ProjectedModel"/> to serialize into <see cref="BinaryContent"/>. </param>
         public static implicit operator BinaryContent(ProjectedModel projectedModel)
         {
-            return System.ClientModel.BinaryContent.Create(projectedModel, ModelSerializationExtensions.WireOptions);
+            return BinaryContent.Create(projectedModel, ModelSerializationExtensions.WireOptions);
         }
 
-        /// <param name="result"> The <see cref="System.ClientModel.ClientResult"/> to deserialize the <see cref="ProjectedModel"/> from. </param>
-        public static explicit operator ProjectedModel(System.ClientModel.ClientResult result)
+        /// <param name="result"> The <see cref="ClientResult"/> to deserialize the <see cref="ProjectedModel"/> from. </param>
+        public static explicit operator ProjectedModel(ClientResult result)
         {
-            using System.ClientModel.Primitives.PipelineResponse response = result.GetRawResponse();
-            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(response.Content);
-            return ProjectedModel.DeserializeProjectedModel(document.RootElement, ModelSerializationExtensions.WireOptions);
+            using PipelineResponse response = result.GetRawResponse();
+            using JsonDocument document = JsonDocument.Parse(response.Content);
+            return DeserializeProjectedModel(document.RootElement, ModelSerializationExtensions.WireOptions);
         }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedModel.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedModel.cs
index 40700ea3afa53..93953c73bf5e4 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedModel.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedModel.cs
@@ -14,14 +14,14 @@ namespace BasicTypeSpec.Models
     public partial class ProjectedModel
     {
         /// <summary> Keeps track of any properties unknown to the library. </summary>
-        private protected IDictionary<string, System.BinaryData> _additionalBinaryDataProperties;
+        private protected IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         internal ProjectedModel(string name)
         {
             Name = name;
         }
 
-        internal ProjectedModel(string name, IDictionary<string, System.BinaryData> additionalBinaryDataProperties)
+        internal ProjectedModel(string name, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             Name = name;
             _additionalBinaryDataProperties = additionalBinaryDataProperties;
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.Serialization.cs
index 805c821f6e401..3bcdfe6ccf292 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.Serialization.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.Serialization.cs
@@ -15,9 +15,9 @@
 namespace BasicTypeSpec.Models
 {
     /// <summary></summary>
-    public partial class ReturnsAnonymousModelResponse : System.ClientModel.Primitives.IJsonModel<ReturnsAnonymousModelResponse>
+    public partial class ReturnsAnonymousModelResponse : IJsonModel<ReturnsAnonymousModelResponse>
     {
-        void System.ClientModel.Primitives.IJsonModel<ReturnsAnonymousModelResponse>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        void IJsonModel<ReturnsAnonymousModelResponse>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -26,9 +26,9 @@ void System.ClientModel.Primitives.IJsonModel<ReturnsAnonymousModelResponse>.Wri
 
         /// <param name="writer"> The JSON writer. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ReturnsAnonymousModelResponse>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<ReturnsAnonymousModelResponse>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(ReturnsAnonymousModelResponse)} does not support writing '{format}' format.");
@@ -41,95 +41,95 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer
 #if NET6_0_OR_GREATER
                     writer.WriteRawValue(item.Value);
 #else
-                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(item.Value))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
-                        System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
+                        JsonSerializer.Serialize(writer, document.RootElement);
                     }
 #endif
                 }
             }
         }
 
-        ReturnsAnonymousModelResponse System.ClientModel.Primitives.IJsonModel<ReturnsAnonymousModelResponse>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+        ReturnsAnonymousModelResponse IJsonModel<ReturnsAnonymousModelResponse>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
 
         /// <param name="reader"> The JSON reader. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual ReturnsAnonymousModelResponse JsonModelCreateCore(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual ReturnsAnonymousModelResponse JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ReturnsAnonymousModelResponse>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<ReturnsAnonymousModelResponse>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(ReturnsAnonymousModelResponse)} does not support reading '{format}' format.");
             }
-            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.ParseValue(ref reader);
-            return ReturnsAnonymousModelResponse.DeserializeReturnsAnonymousModelResponse(document.RootElement, options);
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeReturnsAnonymousModelResponse(document.RootElement, options);
         }
 
-        internal static ReturnsAnonymousModelResponse DeserializeReturnsAnonymousModelResponse(System.Text.Json.JsonElement element, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        internal static ReturnsAnonymousModelResponse DeserializeReturnsAnonymousModelResponse(JsonElement element, ModelReaderWriterOptions options)
         {
-            if (element.ValueKind == System.Text.Json.JsonValueKind.Null)
+            if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
-            IDictionary<string, System.BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, System.BinaryData>();
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
             foreach (var prop in element.EnumerateObject())
             {
                 if (options.Format != "W")
                 {
-                    additionalBinaryDataProperties.Add(prop.Name, System.BinaryData.FromString(prop.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
             return new ReturnsAnonymousModelResponse(additionalBinaryDataProperties);
         }
 
-        System.BinaryData System.ClientModel.Primitives.IPersistableModel<ReturnsAnonymousModelResponse>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
+        BinaryData IPersistableModel<ReturnsAnonymousModelResponse>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual System.BinaryData PersistableModelWriteCore(System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ReturnsAnonymousModelResponse>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<ReturnsAnonymousModelResponse>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    return System.ClientModel.Primitives.ModelReaderWriter.Write(this, options);
+                    return ModelReaderWriter.Write(this, options);
                 default:
                     throw new FormatException($"The model {nameof(ReturnsAnonymousModelResponse)} does not support writing '{options.Format}' format.");
             }
         }
 
-        ReturnsAnonymousModelResponse System.ClientModel.Primitives.IPersistableModel<ReturnsAnonymousModelResponse>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
+        ReturnsAnonymousModelResponse IPersistableModel<ReturnsAnonymousModelResponse>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
         /// <param name="data"> The data to parse. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual ReturnsAnonymousModelResponse PersistableModelCreateCore(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual ReturnsAnonymousModelResponse PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<ReturnsAnonymousModelResponse>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<ReturnsAnonymousModelResponse>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(data))
+                    using (JsonDocument document = JsonDocument.Parse(data))
                     {
-                        return ReturnsAnonymousModelResponse.DeserializeReturnsAnonymousModelResponse(document.RootElement, options);
+                        return DeserializeReturnsAnonymousModelResponse(document.RootElement, options);
                     }
                 default:
                     throw new FormatException($"The model {nameof(ReturnsAnonymousModelResponse)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string System.ClientModel.Primitives.IPersistableModel<ReturnsAnonymousModelResponse>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<ReturnsAnonymousModelResponse>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
-        /// <param name="returnsAnonymousModelResponse"> The <see cref="ReturnsAnonymousModelResponse"/> to serialize into <see cref="System.ClientModel.BinaryContent"/>. </param>
+        /// <param name="returnsAnonymousModelResponse"> The <see cref="ReturnsAnonymousModelResponse"/> to serialize into <see cref="BinaryContent"/>. </param>
         public static implicit operator BinaryContent(ReturnsAnonymousModelResponse returnsAnonymousModelResponse)
         {
-            return System.ClientModel.BinaryContent.Create(returnsAnonymousModelResponse, ModelSerializationExtensions.WireOptions);
+            return BinaryContent.Create(returnsAnonymousModelResponse, ModelSerializationExtensions.WireOptions);
         }
 
-        /// <param name="result"> The <see cref="System.ClientModel.ClientResult"/> to deserialize the <see cref="ReturnsAnonymousModelResponse"/> from. </param>
-        public static explicit operator ReturnsAnonymousModelResponse(System.ClientModel.ClientResult result)
+        /// <param name="result"> The <see cref="ClientResult"/> to deserialize the <see cref="ReturnsAnonymousModelResponse"/> from. </param>
+        public static explicit operator ReturnsAnonymousModelResponse(ClientResult result)
         {
-            using System.ClientModel.Primitives.PipelineResponse response = result.GetRawResponse();
-            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(response.Content);
-            return ReturnsAnonymousModelResponse.DeserializeReturnsAnonymousModelResponse(document.RootElement, ModelSerializationExtensions.WireOptions);
+            using PipelineResponse response = result.GetRawResponse();
+            using JsonDocument document = JsonDocument.Parse(response.Content);
+            return DeserializeReturnsAnonymousModelResponse(document.RootElement, ModelSerializationExtensions.WireOptions);
         }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.cs
index 496cc4d6302cd..68974991df3d2 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ReturnsAnonymousModelResponse.cs
@@ -14,13 +14,13 @@ namespace BasicTypeSpec.Models
     public partial class ReturnsAnonymousModelResponse
     {
         /// <summary> Keeps track of any properties unknown to the library. </summary>
-        private protected IDictionary<string, System.BinaryData> _additionalBinaryDataProperties;
+        private protected IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         internal ReturnsAnonymousModelResponse()
         {
         }
 
-        internal ReturnsAnonymousModelResponse(IDictionary<string, System.BinaryData> additionalBinaryDataProperties)
+        internal ReturnsAnonymousModelResponse(IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/RoundTripModel.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/RoundTripModel.Serialization.cs
index 48cbf1d441e61..fd1dea9632ebe 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/RoundTripModel.Serialization.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/RoundTripModel.Serialization.cs
@@ -15,13 +15,13 @@
 namespace BasicTypeSpec.Models
 {
     /// <summary></summary>
-    public partial class RoundTripModel : System.ClientModel.Primitives.IJsonModel<RoundTripModel>
+    public partial class RoundTripModel : IJsonModel<RoundTripModel>
     {
         internal RoundTripModel()
         {
         }
 
-        void System.ClientModel.Primitives.IJsonModel<RoundTripModel>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        void IJsonModel<RoundTripModel>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -30,9 +30,9 @@ void System.ClientModel.Primitives.IJsonModel<RoundTripModel>.Write(System.Text.
 
         /// <param name="writer"> The JSON writer. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<RoundTripModel>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<RoundTripModel>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(RoundTripModel)} does not support writing '{format}' format.");
@@ -137,9 +137,9 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer
 #if NET6_0_OR_GREATER
             writer.WriteRawValue(RequiredUnknown);
 #else
-            using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(RequiredUnknown))
+            using (JsonDocument document = JsonDocument.Parse(RequiredUnknown))
             {
-                System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
+                JsonSerializer.Serialize(writer, document.RootElement);
             }
 #endif
             if (Optional.IsDefined(OptionalUnknown))
@@ -148,9 +148,9 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer
 #if NET6_0_OR_GREATER
                 writer.WriteRawValue(OptionalUnknown);
 #else
-                using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(OptionalUnknown))
+                using (JsonDocument document = JsonDocument.Parse(OptionalUnknown))
                 {
-                    System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
+                    JsonSerializer.Serialize(writer, document.RootElement);
                 }
 #endif
             }
@@ -167,9 +167,9 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer
 #if NET6_0_OR_GREATER
                 writer.WriteRawValue(item.Value);
 #else
-                using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(item.Value))
+                using (JsonDocument document = JsonDocument.Parse(item.Value))
                 {
-                    System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
+                    JsonSerializer.Serialize(writer, document.RootElement);
                 }
 #endif
             }
@@ -189,9 +189,9 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer
 #if NET6_0_OR_GREATER
                     writer.WriteRawValue(item.Value);
 #else
-                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(item.Value))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
-                        System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
+                        JsonSerializer.Serialize(writer, document.RootElement);
                     }
 #endif
                 }
@@ -212,9 +212,9 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer
 #if NET6_0_OR_GREATER
                     writer.WriteRawValue(item.Value);
 #else
-                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(item.Value))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
-                        System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
+                        JsonSerializer.Serialize(writer, document.RootElement);
                     }
 #endif
                 }
@@ -235,9 +235,9 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer
 #if NET6_0_OR_GREATER
                     writer.WriteRawValue(item.Value);
 #else
-                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(item.Value))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
-                        System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
+                        JsonSerializer.Serialize(writer, document.RootElement);
                     }
 #endif
                 }
@@ -255,33 +255,33 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer
 #if NET6_0_OR_GREATER
                     writer.WriteRawValue(item.Value);
 #else
-                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(item.Value))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
-                        System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
+                        JsonSerializer.Serialize(writer, document.RootElement);
                     }
 #endif
                 }
             }
         }
 
-        RoundTripModel System.ClientModel.Primitives.IJsonModel<RoundTripModel>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+        RoundTripModel IJsonModel<RoundTripModel>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
 
         /// <param name="reader"> The JSON reader. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual RoundTripModel JsonModelCreateCore(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual RoundTripModel JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<RoundTripModel>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<RoundTripModel>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(RoundTripModel)} does not support reading '{format}' format.");
             }
-            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.ParseValue(ref reader);
-            return RoundTripModel.DeserializeRoundTripModel(document.RootElement, options);
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeRoundTripModel(document.RootElement, options);
         }
 
-        internal static RoundTripModel DeserializeRoundTripModel(System.Text.Json.JsonElement element, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        internal static RoundTripModel DeserializeRoundTripModel(JsonElement element, ModelReaderWriterOptions options)
         {
-            if (element.ValueKind == System.Text.Json.JsonValueKind.Null)
+            if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
@@ -301,15 +301,15 @@ internal static RoundTripModel DeserializeRoundTripModel(System.Text.Json.JsonEl
             IntFixedEnum? intFixedEnum = default;
             IList<IntFixedEnum> intFixedEnumCollection = default;
             StringFixedEnum? stringFixedEnum = default;
-            System.BinaryData requiredUnknown = default;
-            System.BinaryData optionalUnknown = default;
-            IDictionary<string, System.BinaryData> requiredRecordUnknown = default;
-            IDictionary<string, System.BinaryData> optionalRecordUnknown = default;
-            IReadOnlyDictionary<string, System.BinaryData> readOnlyRequiredRecordUnknown = default;
-            IReadOnlyDictionary<string, System.BinaryData> readOnlyOptionalRecordUnknown = default;
+            BinaryData requiredUnknown = default;
+            BinaryData optionalUnknown = default;
+            IDictionary<string, BinaryData> requiredRecordUnknown = default;
+            IDictionary<string, BinaryData> optionalRecordUnknown = default;
+            IReadOnlyDictionary<string, BinaryData> readOnlyRequiredRecordUnknown = default;
+            IReadOnlyDictionary<string, BinaryData> readOnlyOptionalRecordUnknown = default;
             ModelWithRequiredNullableProperties modelWithRequiredNullable = default;
-            System.BinaryData requiredBytes = default;
-            IDictionary<string, System.BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, System.BinaryData>();
+            BinaryData requiredBytes = default;
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
             foreach (var prop in element.EnumerateObject())
             {
                 if (prop.NameEquals("requiredString"u8))
@@ -349,7 +349,7 @@ internal static RoundTripModel DeserializeRoundTripModel(System.Text.Json.JsonEl
                 }
                 if (prop.NameEquals("intExtensibleEnum"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         intExtensibleEnum = null;
                         continue;
@@ -359,7 +359,7 @@ internal static RoundTripModel DeserializeRoundTripModel(System.Text.Json.JsonEl
                 }
                 if (prop.NameEquals("intExtensibleEnumCollection"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
@@ -373,7 +373,7 @@ internal static RoundTripModel DeserializeRoundTripModel(System.Text.Json.JsonEl
                 }
                 if (prop.NameEquals("floatExtensibleEnum"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         floatExtensibleEnum = null;
                         continue;
@@ -383,7 +383,7 @@ internal static RoundTripModel DeserializeRoundTripModel(System.Text.Json.JsonEl
                 }
                 if (prop.NameEquals("floatExtensibleEnumWithIntValue"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         floatExtensibleEnumWithIntValue = null;
                         continue;
@@ -393,7 +393,7 @@ internal static RoundTripModel DeserializeRoundTripModel(System.Text.Json.JsonEl
                 }
                 if (prop.NameEquals("floatExtensibleEnumCollection"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
@@ -407,7 +407,7 @@ internal static RoundTripModel DeserializeRoundTripModel(System.Text.Json.JsonEl
                 }
                 if (prop.NameEquals("floatFixedEnum"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         floatFixedEnum = null;
                         continue;
@@ -417,7 +417,7 @@ internal static RoundTripModel DeserializeRoundTripModel(System.Text.Json.JsonEl
                 }
                 if (prop.NameEquals("floatFixedEnumWithIntValue"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         floatFixedEnumWithIntValue = null;
                         continue;
@@ -427,7 +427,7 @@ internal static RoundTripModel DeserializeRoundTripModel(System.Text.Json.JsonEl
                 }
                 if (prop.NameEquals("floatFixedEnumCollection"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
@@ -441,7 +441,7 @@ internal static RoundTripModel DeserializeRoundTripModel(System.Text.Json.JsonEl
                 }
                 if (prop.NameEquals("intFixedEnum"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         intFixedEnum = null;
                         continue;
@@ -451,7 +451,7 @@ internal static RoundTripModel DeserializeRoundTripModel(System.Text.Json.JsonEl
                 }
                 if (prop.NameEquals("intFixedEnumCollection"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
@@ -465,7 +465,7 @@ internal static RoundTripModel DeserializeRoundTripModel(System.Text.Json.JsonEl
                 }
                 if (prop.NameEquals("stringFixedEnum"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         stringFixedEnum = null;
                         continue;
@@ -475,31 +475,31 @@ internal static RoundTripModel DeserializeRoundTripModel(System.Text.Json.JsonEl
                 }
                 if (prop.NameEquals("requiredUnknown"u8))
                 {
-                    requiredUnknown = System.BinaryData.FromString(prop.Value.GetRawText());
+                    requiredUnknown = BinaryData.FromString(prop.Value.GetRawText());
                     continue;
                 }
                 if (prop.NameEquals("optionalUnknown"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         optionalUnknown = null;
                         continue;
                     }
-                    optionalUnknown = System.BinaryData.FromString(prop.Value.GetRawText());
+                    optionalUnknown = BinaryData.FromString(prop.Value.GetRawText());
                     continue;
                 }
                 if (prop.NameEquals("requiredRecordUnknown"u8))
                 {
-                    Dictionary<string, System.BinaryData> dictionary = new Dictionary<string, System.BinaryData>();
+                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
                     foreach (var prop0 in prop.Value.EnumerateObject())
                     {
-                        if (prop0.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                        if (prop0.Value.ValueKind == JsonValueKind.Null)
                         {
                             dictionary.Add(prop0.Name, null);
                         }
                         else
                         {
-                            dictionary.Add(prop0.Name, System.BinaryData.FromString(prop0.Value.GetRawText()));
+                            dictionary.Add(prop0.Name, BinaryData.FromString(prop0.Value.GetRawText()));
                         }
                     }
                     requiredRecordUnknown = dictionary;
@@ -507,20 +507,20 @@ internal static RoundTripModel DeserializeRoundTripModel(System.Text.Json.JsonEl
                 }
                 if (prop.NameEquals("optionalRecordUnknown"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    Dictionary<string, System.BinaryData> dictionary = new Dictionary<string, System.BinaryData>();
+                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
                     foreach (var prop0 in prop.Value.EnumerateObject())
                     {
-                        if (prop0.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                        if (prop0.Value.ValueKind == JsonValueKind.Null)
                         {
                             dictionary.Add(prop0.Name, null);
                         }
                         else
                         {
-                            dictionary.Add(prop0.Name, System.BinaryData.FromString(prop0.Value.GetRawText()));
+                            dictionary.Add(prop0.Name, BinaryData.FromString(prop0.Value.GetRawText()));
                         }
                     }
                     optionalRecordUnknown = dictionary;
@@ -528,16 +528,16 @@ internal static RoundTripModel DeserializeRoundTripModel(System.Text.Json.JsonEl
                 }
                 if (prop.NameEquals("readOnlyRequiredRecordUnknown"u8))
                 {
-                    Dictionary<string, System.BinaryData> dictionary = new Dictionary<string, System.BinaryData>();
+                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
                     foreach (var prop0 in prop.Value.EnumerateObject())
                     {
-                        if (prop0.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                        if (prop0.Value.ValueKind == JsonValueKind.Null)
                         {
                             dictionary.Add(prop0.Name, null);
                         }
                         else
                         {
-                            dictionary.Add(prop0.Name, System.BinaryData.FromString(prop0.Value.GetRawText()));
+                            dictionary.Add(prop0.Name, BinaryData.FromString(prop0.Value.GetRawText()));
                         }
                     }
                     readOnlyRequiredRecordUnknown = dictionary;
@@ -545,20 +545,20 @@ internal static RoundTripModel DeserializeRoundTripModel(System.Text.Json.JsonEl
                 }
                 if (prop.NameEquals("readOnlyOptionalRecordUnknown"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
-                    Dictionary<string, System.BinaryData> dictionary = new Dictionary<string, System.BinaryData>();
+                    Dictionary<string, BinaryData> dictionary = new Dictionary<string, BinaryData>();
                     foreach (var prop0 in prop.Value.EnumerateObject())
                     {
-                        if (prop0.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                        if (prop0.Value.ValueKind == JsonValueKind.Null)
                         {
                             dictionary.Add(prop0.Name, null);
                         }
                         else
                         {
-                            dictionary.Add(prop0.Name, System.BinaryData.FromString(prop0.Value.GetRawText()));
+                            dictionary.Add(prop0.Name, BinaryData.FromString(prop0.Value.GetRawText()));
                         }
                     }
                     readOnlyOptionalRecordUnknown = dictionary;
@@ -571,12 +571,12 @@ internal static RoundTripModel DeserializeRoundTripModel(System.Text.Json.JsonEl
                 }
                 if (prop.NameEquals("requiredBytes"u8))
                 {
-                    requiredBytes = System.BinaryData.FromBytes(prop.Value.GetBytesFromBase64("D"));
+                    requiredBytes = BinaryData.FromBytes(prop.Value.GetBytesFromBase64("D"));
                     continue;
                 }
                 if (options.Format != "W")
                 {
-                    additionalBinaryDataProperties.Add(prop.Name, System.BinaryData.FromString(prop.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
             return new RoundTripModel(
@@ -599,62 +599,62 @@ internal static RoundTripModel DeserializeRoundTripModel(System.Text.Json.JsonEl
                 requiredUnknown,
                 optionalUnknown,
                 requiredRecordUnknown,
-                optionalRecordUnknown ?? new ChangeTrackingDictionary<string, System.BinaryData>(),
+                optionalRecordUnknown ?? new ChangeTrackingDictionary<string, BinaryData>(),
                 readOnlyRequiredRecordUnknown,
-                readOnlyOptionalRecordUnknown ?? new ChangeTrackingDictionary<string, System.BinaryData>(),
+                readOnlyOptionalRecordUnknown ?? new ChangeTrackingDictionary<string, BinaryData>(),
                 modelWithRequiredNullable,
                 requiredBytes,
                 additionalBinaryDataProperties);
         }
 
-        System.BinaryData System.ClientModel.Primitives.IPersistableModel<RoundTripModel>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
+        BinaryData IPersistableModel<RoundTripModel>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual System.BinaryData PersistableModelWriteCore(System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<RoundTripModel>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<RoundTripModel>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    return System.ClientModel.Primitives.ModelReaderWriter.Write(this, options);
+                    return ModelReaderWriter.Write(this, options);
                 default:
                     throw new FormatException($"The model {nameof(RoundTripModel)} does not support writing '{options.Format}' format.");
             }
         }
 
-        RoundTripModel System.ClientModel.Primitives.IPersistableModel<RoundTripModel>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
+        RoundTripModel IPersistableModel<RoundTripModel>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
         /// <param name="data"> The data to parse. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual RoundTripModel PersistableModelCreateCore(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual RoundTripModel PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<RoundTripModel>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<RoundTripModel>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(data))
+                    using (JsonDocument document = JsonDocument.Parse(data))
                     {
-                        return RoundTripModel.DeserializeRoundTripModel(document.RootElement, options);
+                        return DeserializeRoundTripModel(document.RootElement, options);
                     }
                 default:
                     throw new FormatException($"The model {nameof(RoundTripModel)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string System.ClientModel.Primitives.IPersistableModel<RoundTripModel>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<RoundTripModel>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
-        /// <param name="roundTripModel"> The <see cref="RoundTripModel"/> to serialize into <see cref="System.ClientModel.BinaryContent"/>. </param>
+        /// <param name="roundTripModel"> The <see cref="RoundTripModel"/> to serialize into <see cref="BinaryContent"/>. </param>
         public static implicit operator BinaryContent(RoundTripModel roundTripModel)
         {
-            return System.ClientModel.BinaryContent.Create(roundTripModel, ModelSerializationExtensions.WireOptions);
+            return BinaryContent.Create(roundTripModel, ModelSerializationExtensions.WireOptions);
         }
 
-        /// <param name="result"> The <see cref="System.ClientModel.ClientResult"/> to deserialize the <see cref="RoundTripModel"/> from. </param>
-        public static explicit operator RoundTripModel(System.ClientModel.ClientResult result)
+        /// <param name="result"> The <see cref="ClientResult"/> to deserialize the <see cref="RoundTripModel"/> from. </param>
+        public static explicit operator RoundTripModel(ClientResult result)
         {
-            using System.ClientModel.Primitives.PipelineResponse response = result.GetRawResponse();
-            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(response.Content);
-            return RoundTripModel.DeserializeRoundTripModel(document.RootElement, ModelSerializationExtensions.WireOptions);
+            using PipelineResponse response = result.GetRawResponse();
+            using JsonDocument document = JsonDocument.Parse(response.Content);
+            return DeserializeRoundTripModel(document.RootElement, ModelSerializationExtensions.WireOptions);
         }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/RoundTripModel.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/RoundTripModel.cs
index 1da69f03cc6ed..c4b65911d127f 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/RoundTripModel.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/RoundTripModel.cs
@@ -17,7 +17,7 @@ namespace BasicTypeSpec.Models
     public partial class RoundTripModel
     {
         /// <summary> Keeps track of any properties unknown to the library. </summary>
-        private protected IDictionary<string, System.BinaryData> _additionalBinaryDataProperties;
+        private protected IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="RoundTripModel"/>. </summary>
         /// <param name="requiredString"></param>
@@ -30,7 +30,7 @@ public partial class RoundTripModel
         /// <param name="modelWithRequiredNullable"></param>
         /// <param name="requiredBytes"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="requiredString"/>, <paramref name="requiredCollection"/>, <paramref name="requiredDictionary"/>, <paramref name="requiredModel"/>, <paramref name="requiredUnknown"/>, <paramref name="requiredRecordUnknown"/>, <paramref name="modelWithRequiredNullable"/> or <paramref name="requiredBytes"/> is null. </exception>
-        public RoundTripModel(string requiredString, int requiredInt, IEnumerable<StringFixedEnum> requiredCollection, IDictionary<string, StringExtensibleEnum> requiredDictionary, Thing requiredModel, System.BinaryData requiredUnknown, IDictionary<string, System.BinaryData> requiredRecordUnknown, ModelWithRequiredNullableProperties modelWithRequiredNullable, System.BinaryData requiredBytes)
+        public RoundTripModel(string requiredString, int requiredInt, IEnumerable<StringFixedEnum> requiredCollection, IDictionary<string, StringExtensibleEnum> requiredDictionary, Thing requiredModel, BinaryData requiredUnknown, IDictionary<string, BinaryData> requiredRecordUnknown, ModelWithRequiredNullableProperties modelWithRequiredNullable, BinaryData requiredBytes)
         {
             Argument.AssertNotNull(requiredString, nameof(requiredString));
             Argument.AssertNotNull(requiredCollection, nameof(requiredCollection));
@@ -52,14 +52,14 @@ public RoundTripModel(string requiredString, int requiredInt, IEnumerable<String
             IntFixedEnumCollection = new ChangeTrackingList<IntFixedEnum>();
             RequiredUnknown = requiredUnknown;
             RequiredRecordUnknown = requiredRecordUnknown;
-            OptionalRecordUnknown = new ChangeTrackingDictionary<string, System.BinaryData>();
-            ReadOnlyRequiredRecordUnknown = new ChangeTrackingDictionary<string, System.BinaryData>();
-            ReadOnlyOptionalRecordUnknown = new ChangeTrackingDictionary<string, System.BinaryData>();
+            OptionalRecordUnknown = new ChangeTrackingDictionary<string, BinaryData>();
+            ReadOnlyRequiredRecordUnknown = new ChangeTrackingDictionary<string, BinaryData>();
+            ReadOnlyOptionalRecordUnknown = new ChangeTrackingDictionary<string, BinaryData>();
             ModelWithRequiredNullable = modelWithRequiredNullable;
             RequiredBytes = requiredBytes;
         }
 
-        internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixedEnum> requiredCollection, IDictionary<string, StringExtensibleEnum> requiredDictionary, Thing requiredModel, IntExtensibleEnum? intExtensibleEnum, IList<IntExtensibleEnum> intExtensibleEnumCollection, FloatExtensibleEnum? floatExtensibleEnum, FloatExtensibleEnumWithIntValue? floatExtensibleEnumWithIntValue, IList<FloatExtensibleEnum> floatExtensibleEnumCollection, FloatFixedEnum? floatFixedEnum, FloatFixedEnumWithIntValue? floatFixedEnumWithIntValue, IList<FloatFixedEnum> floatFixedEnumCollection, IntFixedEnum? intFixedEnum, IList<IntFixedEnum> intFixedEnumCollection, StringFixedEnum? stringFixedEnum, System.BinaryData requiredUnknown, System.BinaryData optionalUnknown, IDictionary<string, System.BinaryData> requiredRecordUnknown, IDictionary<string, System.BinaryData> optionalRecordUnknown, IReadOnlyDictionary<string, System.BinaryData> readOnlyRequiredRecordUnknown, IReadOnlyDictionary<string, System.BinaryData> readOnlyOptionalRecordUnknown, ModelWithRequiredNullableProperties modelWithRequiredNullable, System.BinaryData requiredBytes, IDictionary<string, System.BinaryData> additionalBinaryDataProperties)
+        internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixedEnum> requiredCollection, IDictionary<string, StringExtensibleEnum> requiredDictionary, Thing requiredModel, IntExtensibleEnum? intExtensibleEnum, IList<IntExtensibleEnum> intExtensibleEnumCollection, FloatExtensibleEnum? floatExtensibleEnum, FloatExtensibleEnumWithIntValue? floatExtensibleEnumWithIntValue, IList<FloatExtensibleEnum> floatExtensibleEnumCollection, FloatFixedEnum? floatFixedEnum, FloatFixedEnumWithIntValue? floatFixedEnumWithIntValue, IList<FloatFixedEnum> floatFixedEnumCollection, IntFixedEnum? intFixedEnum, IList<IntFixedEnum> intFixedEnumCollection, StringFixedEnum? stringFixedEnum, BinaryData requiredUnknown, BinaryData optionalUnknown, IDictionary<string, BinaryData> requiredRecordUnknown, IDictionary<string, BinaryData> optionalRecordUnknown, IReadOnlyDictionary<string, BinaryData> readOnlyRequiredRecordUnknown, IReadOnlyDictionary<string, BinaryData> readOnlyOptionalRecordUnknown, ModelWithRequiredNullableProperties modelWithRequiredNullable, BinaryData requiredBytes, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             RequiredString = requiredString;
             RequiredInt = requiredInt;
@@ -138,8 +138,8 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
 
         /// <summary>
         /// Gets or sets the RequiredUnknown.
-        /// <para> To assign an object to this property use <see cref="System.BinaryData.FromObjectAsJson{T}(T, Text.Json.JsonSerializerOptions?)"/>. </para>
-        /// <para> To assign an already formatted json string to this property use <see cref="System.BinaryData.FromString(string)"/>. </para>
+        /// <para> To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, JsonSerializerOptions?)"/>. </para>
+        /// <para> To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>. </para>
         /// <para>
         /// Examples:
         /// <list type="bullet">
@@ -162,12 +162,12 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
         /// </list>
         /// </para>
         /// </summary>
-        public System.BinaryData RequiredUnknown { get; set; }
+        public BinaryData RequiredUnknown { get; set; }
 
         /// <summary>
         /// Gets or sets the OptionalUnknown.
-        /// <para> To assign an object to this property use <see cref="System.BinaryData.FromObjectAsJson{T}(T, Text.Json.JsonSerializerOptions?)"/>. </para>
-        /// <para> To assign an already formatted json string to this property use <see cref="System.BinaryData.FromString(string)"/>. </para>
+        /// <para> To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, JsonSerializerOptions?)"/>. </para>
+        /// <para> To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>. </para>
         /// <para>
         /// Examples:
         /// <list type="bullet">
@@ -190,12 +190,12 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
         /// </list>
         /// </para>
         /// </summary>
-        public System.BinaryData OptionalUnknown { get; set; }
+        public BinaryData OptionalUnknown { get; set; }
 
         /// <summary>
         /// Gets the RequiredRecordUnknown.
-        /// <para> To assign an object to the value of this property use <see cref="System.BinaryData.FromObjectAsJson{T}(T, Text.Json.JsonSerializerOptions?)"/>. </para>
-        /// <para> To assign an already formatted json string to this property use <see cref="System.BinaryData.FromString(string)"/>. </para>
+        /// <para> To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, JsonSerializerOptions?)"/>. </para>
+        /// <para> To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>. </para>
         /// <para>
         /// Examples:
         /// <list type="bullet">
@@ -218,12 +218,12 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, System.BinaryData> RequiredRecordUnknown { get; }
+        public IDictionary<string, BinaryData> RequiredRecordUnknown { get; }
 
         /// <summary>
         /// Gets the OptionalRecordUnknown.
-        /// <para> To assign an object to the value of this property use <see cref="System.BinaryData.FromObjectAsJson{T}(T, Text.Json.JsonSerializerOptions?)"/>. </para>
-        /// <para> To assign an already formatted json string to this property use <see cref="System.BinaryData.FromString(string)"/>. </para>
+        /// <para> To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, JsonSerializerOptions?)"/>. </para>
+        /// <para> To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>. </para>
         /// <para>
         /// Examples:
         /// <list type="bullet">
@@ -246,12 +246,12 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
         /// </list>
         /// </para>
         /// </summary>
-        public IDictionary<string, System.BinaryData> OptionalRecordUnknown { get; }
+        public IDictionary<string, BinaryData> OptionalRecordUnknown { get; }
 
         /// <summary>
         /// Gets the ReadOnlyRequiredRecordUnknown.
-        /// <para> To assign an object to the value of this property use <see cref="System.BinaryData.FromObjectAsJson{T}(T, Text.Json.JsonSerializerOptions?)"/>. </para>
-        /// <para> To assign an already formatted json string to this property use <see cref="System.BinaryData.FromString(string)"/>. </para>
+        /// <para> To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, JsonSerializerOptions?)"/>. </para>
+        /// <para> To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>. </para>
         /// <para>
         /// Examples:
         /// <list type="bullet">
@@ -274,12 +274,12 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
         /// </list>
         /// </para>
         /// </summary>
-        public IReadOnlyDictionary<string, System.BinaryData> ReadOnlyRequiredRecordUnknown { get; }
+        public IReadOnlyDictionary<string, BinaryData> ReadOnlyRequiredRecordUnknown { get; }
 
         /// <summary>
         /// Gets the ReadOnlyOptionalRecordUnknown.
-        /// <para> To assign an object to the value of this property use <see cref="System.BinaryData.FromObjectAsJson{T}(T, Text.Json.JsonSerializerOptions?)"/>. </para>
-        /// <para> To assign an already formatted json string to this property use <see cref="System.BinaryData.FromString(string)"/>. </para>
+        /// <para> To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, JsonSerializerOptions?)"/>. </para>
+        /// <para> To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>. </para>
         /// <para>
         /// Examples:
         /// <list type="bullet">
@@ -302,7 +302,7 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
         /// </list>
         /// </para>
         /// </summary>
-        public IReadOnlyDictionary<string, System.BinaryData> ReadOnlyOptionalRecordUnknown { get; }
+        public IReadOnlyDictionary<string, BinaryData> ReadOnlyOptionalRecordUnknown { get; }
 
         /// <summary> Gets or sets the ModelWithRequiredNullable. </summary>
         public ModelWithRequiredNullableProperties ModelWithRequiredNullable { get; set; }
@@ -310,7 +310,7 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
         /// <summary>
         /// Gets or sets the RequiredBytes.
         /// <para>
-        /// To assign a byte[] to this property use <see cref="System.BinaryData.FromBytes(byte[])"/>.
+        /// To assign a byte[] to this property use <see cref="BinaryData.FromBytes(byte[])"/>.
         /// The byte[] will be serialized to a Base64 encoded string.
         /// </para>
         /// <para>
@@ -323,6 +323,6 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
         /// </list>
         /// </para>
         /// </summary>
-        public System.BinaryData RequiredBytes { get; set; }
+        public BinaryData RequiredBytes { get; set; }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Thing.Serialization.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Thing.Serialization.cs
index 3c2ad85f63885..aed5b19c24d8d 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Thing.Serialization.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Thing.Serialization.cs
@@ -15,13 +15,13 @@
 namespace BasicTypeSpec.Models
 {
     /// <summary></summary>
-    public partial class Thing : System.ClientModel.Primitives.IJsonModel<Thing>
+    public partial class Thing : IJsonModel<Thing>
     {
         internal Thing()
         {
         }
 
-        void System.ClientModel.Primitives.IJsonModel<Thing>.Write(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        void IJsonModel<Thing>.Write(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
             writer.WriteStartObject();
             JsonModelWriteCore(writer, options);
@@ -30,9 +30,9 @@ void System.ClientModel.Primitives.IJsonModel<Thing>.Write(System.Text.Json.Utf8
 
         /// <param name="writer"> The JSON writer. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual void JsonModelWriteCore(Utf8JsonWriter writer, ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<Thing>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<Thing>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(Thing)} does not support writing '{format}' format.");
@@ -43,9 +43,9 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer
 #if NET6_0_OR_GREATER
             writer.WriteRawValue(RequiredUnion);
 #else
-            using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(RequiredUnion))
+            using (JsonDocument document = JsonDocument.Parse(RequiredUnion))
             {
-                System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
+                JsonSerializer.Serialize(writer, document.RootElement);
             }
 #endif
             writer.WritePropertyName("requiredLiteralString"u8);
@@ -117,38 +117,38 @@ protected virtual void JsonModelWriteCore(System.Text.Json.Utf8JsonWriter writer
 #if NET6_0_OR_GREATER
                     writer.WriteRawValue(item.Value);
 #else
-                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(item.Value))
+                    using (JsonDocument document = JsonDocument.Parse(item.Value))
                     {
-                        System.Text.Json.JsonSerializer.Serialize(writer, document.RootElement);
+                        JsonSerializer.Serialize(writer, document.RootElement);
                     }
 #endif
                 }
             }
         }
 
-        Thing System.ClientModel.Primitives.IJsonModel<Thing>.Create(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
+        Thing IJsonModel<Thing>.Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => JsonModelCreateCore(ref reader, options);
 
         /// <param name="reader"> The JSON reader. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual Thing JsonModelCreateCore(ref System.Text.Json.Utf8JsonReader reader, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual Thing JsonModelCreateCore(ref Utf8JsonReader reader, ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<Thing>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<Thing>)this).GetFormatFromOptions(options) : options.Format;
             if (format != "J")
             {
                 throw new FormatException($"The model {nameof(Thing)} does not support reading '{format}' format.");
             }
-            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.ParseValue(ref reader);
-            return Thing.DeserializeThing(document.RootElement, options);
+            using JsonDocument document = JsonDocument.ParseValue(ref reader);
+            return DeserializeThing(document.RootElement, options);
         }
 
-        internal static Thing DeserializeThing(System.Text.Json.JsonElement element, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        internal static Thing DeserializeThing(JsonElement element, ModelReaderWriterOptions options)
         {
-            if (element.ValueKind == System.Text.Json.JsonValueKind.Null)
+            if (element.ValueKind == JsonValueKind.Null)
             {
                 return null;
             }
             string name = default;
-            System.BinaryData requiredUnion = default;
+            BinaryData requiredUnion = default;
             ThingRequiredLiteralString requiredLiteralString = default;
             ThingRequiredLiteralInt requiredLiteralInt = default;
             ThingRequiredLiteralFloat requiredLiteralFloat = default;
@@ -160,7 +160,7 @@ internal static Thing DeserializeThing(System.Text.Json.JsonElement element, Sys
             string requiredBadDescription = default;
             IList<int> optionalNullableList = default;
             IList<int> requiredNullableList = default;
-            IDictionary<string, System.BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, System.BinaryData>();
+            IDictionary<string, BinaryData> additionalBinaryDataProperties = new ChangeTrackingDictionary<string, BinaryData>();
             foreach (var prop in element.EnumerateObject())
             {
                 if (prop.NameEquals("name"u8))
@@ -170,7 +170,7 @@ internal static Thing DeserializeThing(System.Text.Json.JsonElement element, Sys
                 }
                 if (prop.NameEquals("requiredUnion"u8))
                 {
-                    requiredUnion = System.BinaryData.FromString(prop.Value.GetRawText());
+                    requiredUnion = BinaryData.FromString(prop.Value.GetRawText());
                     continue;
                 }
                 if (prop.NameEquals("requiredLiteralString"u8))
@@ -195,7 +195,7 @@ internal static Thing DeserializeThing(System.Text.Json.JsonElement element, Sys
                 }
                 if (prop.NameEquals("optionalLiteralString"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         optionalLiteralString = null;
                         continue;
@@ -205,7 +205,7 @@ internal static Thing DeserializeThing(System.Text.Json.JsonElement element, Sys
                 }
                 if (prop.NameEquals("optionalLiteralInt"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         optionalLiteralInt = null;
                         continue;
@@ -215,7 +215,7 @@ internal static Thing DeserializeThing(System.Text.Json.JsonElement element, Sys
                 }
                 if (prop.NameEquals("optionalLiteralFloat"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         optionalLiteralFloat = null;
                         continue;
@@ -225,7 +225,7 @@ internal static Thing DeserializeThing(System.Text.Json.JsonElement element, Sys
                 }
                 if (prop.NameEquals("optionalLiteralBool"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         optionalLiteralBool = null;
                         continue;
@@ -240,7 +240,7 @@ internal static Thing DeserializeThing(System.Text.Json.JsonElement element, Sys
                 }
                 if (prop.NameEquals("optionalNullableList"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         continue;
                     }
@@ -254,7 +254,7 @@ internal static Thing DeserializeThing(System.Text.Json.JsonElement element, Sys
                 }
                 if (prop.NameEquals("requiredNullableList"u8))
                 {
-                    if (prop.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
+                    if (prop.Value.ValueKind == JsonValueKind.Null)
                     {
                         requiredNullableList = new ChangeTrackingList<int>();
                         continue;
@@ -269,7 +269,7 @@ internal static Thing DeserializeThing(System.Text.Json.JsonElement element, Sys
                 }
                 if (options.Format != "W")
                 {
-                    additionalBinaryDataProperties.Add(prop.Name, System.BinaryData.FromString(prop.Value.GetRawText()));
+                    additionalBinaryDataProperties.Add(prop.Name, BinaryData.FromString(prop.Value.GetRawText()));
                 }
             }
             return new Thing(
@@ -289,54 +289,54 @@ internal static Thing DeserializeThing(System.Text.Json.JsonElement element, Sys
                 additionalBinaryDataProperties);
         }
 
-        System.BinaryData System.ClientModel.Primitives.IPersistableModel<Thing>.Write(System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
+        BinaryData IPersistableModel<Thing>.Write(ModelReaderWriterOptions options) => PersistableModelWriteCore(options);
 
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual System.BinaryData PersistableModelWriteCore(System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual BinaryData PersistableModelWriteCore(ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<Thing>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<Thing>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    return System.ClientModel.Primitives.ModelReaderWriter.Write(this, options);
+                    return ModelReaderWriter.Write(this, options);
                 default:
                     throw new FormatException($"The model {nameof(Thing)} does not support writing '{options.Format}' format.");
             }
         }
 
-        Thing System.ClientModel.Primitives.IPersistableModel<Thing>.Create(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
+        Thing IPersistableModel<Thing>.Create(BinaryData data, ModelReaderWriterOptions options) => PersistableModelCreateCore(data, options);
 
         /// <param name="data"> The data to parse. </param>
         /// <param name="options"> The client options for reading and writing models. </param>
-        protected virtual Thing PersistableModelCreateCore(System.BinaryData data, System.ClientModel.Primitives.ModelReaderWriterOptions options)
+        protected virtual Thing PersistableModelCreateCore(BinaryData data, ModelReaderWriterOptions options)
         {
-            string format = options.Format == "W" ? ((System.ClientModel.Primitives.IPersistableModel<Thing>)this).GetFormatFromOptions(options) : options.Format;
+            string format = options.Format == "W" ? ((IPersistableModel<Thing>)this).GetFormatFromOptions(options) : options.Format;
             switch (format)
             {
                 case "J":
-                    using (System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(data))
+                    using (JsonDocument document = JsonDocument.Parse(data))
                     {
-                        return Thing.DeserializeThing(document.RootElement, options);
+                        return DeserializeThing(document.RootElement, options);
                     }
                 default:
                     throw new FormatException($"The model {nameof(Thing)} does not support reading '{options.Format}' format.");
             }
         }
 
-        string System.ClientModel.Primitives.IPersistableModel<Thing>.GetFormatFromOptions(System.ClientModel.Primitives.ModelReaderWriterOptions options) => "J";
+        string IPersistableModel<Thing>.GetFormatFromOptions(ModelReaderWriterOptions options) => "J";
 
-        /// <param name="thing"> The <see cref="Thing"/> to serialize into <see cref="System.ClientModel.BinaryContent"/>. </param>
+        /// <param name="thing"> The <see cref="Thing"/> to serialize into <see cref="BinaryContent"/>. </param>
         public static implicit operator BinaryContent(Thing thing)
         {
-            return System.ClientModel.BinaryContent.Create(thing, ModelSerializationExtensions.WireOptions);
+            return BinaryContent.Create(thing, ModelSerializationExtensions.WireOptions);
         }
 
-        /// <param name="result"> The <see cref="System.ClientModel.ClientResult"/> to deserialize the <see cref="Thing"/> from. </param>
-        public static explicit operator Thing(System.ClientModel.ClientResult result)
+        /// <param name="result"> The <see cref="ClientResult"/> to deserialize the <see cref="Thing"/> from. </param>
+        public static explicit operator Thing(ClientResult result)
         {
-            using System.ClientModel.Primitives.PipelineResponse response = result.GetRawResponse();
-            using System.Text.Json.JsonDocument document = System.Text.Json.JsonDocument.Parse(response.Content);
-            return Thing.DeserializeThing(document.RootElement, ModelSerializationExtensions.WireOptions);
+            using PipelineResponse response = result.GetRawResponse();
+            using JsonDocument document = JsonDocument.Parse(response.Content);
+            return DeserializeThing(document.RootElement, ModelSerializationExtensions.WireOptions);
         }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Thing.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Thing.cs
index 0af7873afdaa7..b4f1ac523b8a6 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Thing.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Thing.cs
@@ -17,7 +17,7 @@ namespace BasicTypeSpec.Models
     public partial class Thing
     {
         /// <summary> Keeps track of any properties unknown to the library. </summary>
-        private protected IDictionary<string, System.BinaryData> _additionalBinaryDataProperties;
+        private protected IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="Thing"/>. </summary>
         /// <param name="name"></param>
@@ -25,7 +25,7 @@ public partial class Thing
         /// <param name="requiredBadDescription"></param>
         /// <param name="requiredNullableList"></param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/>, <paramref name="requiredUnion"/> or <paramref name="requiredBadDescription"/> is null. </exception>
-        public Thing(string name, System.BinaryData requiredUnion, string requiredBadDescription, IEnumerable<int> requiredNullableList)
+        public Thing(string name, BinaryData requiredUnion, string requiredBadDescription, IEnumerable<int> requiredNullableList)
         {
             Argument.AssertNotNull(name, nameof(name));
             Argument.AssertNotNull(requiredUnion, nameof(requiredUnion));
@@ -38,7 +38,7 @@ public Thing(string name, System.BinaryData requiredUnion, string requiredBadDes
             RequiredNullableList = requiredNullableList?.ToList();
         }
 
-        internal Thing(string name, System.BinaryData requiredUnion, ThingRequiredLiteralString requiredLiteralString, ThingRequiredLiteralInt requiredLiteralInt, ThingRequiredLiteralFloat requiredLiteralFloat, bool requiredLiteralBool, ThingOptionalLiteralString? optionalLiteralString, ThingOptionalLiteralInt? optionalLiteralInt, ThingOptionalLiteralFloat? optionalLiteralFloat, bool? optionalLiteralBool, string requiredBadDescription, IList<int> optionalNullableList, IList<int> requiredNullableList, IDictionary<string, System.BinaryData> additionalBinaryDataProperties)
+        internal Thing(string name, BinaryData requiredUnion, ThingRequiredLiteralString requiredLiteralString, ThingRequiredLiteralInt requiredLiteralInt, ThingRequiredLiteralFloat requiredLiteralFloat, bool requiredLiteralBool, ThingOptionalLiteralString? optionalLiteralString, ThingOptionalLiteralInt? optionalLiteralInt, ThingOptionalLiteralFloat? optionalLiteralFloat, bool? optionalLiteralBool, string requiredBadDescription, IList<int> optionalNullableList, IList<int> requiredNullableList, IDictionary<string, BinaryData> additionalBinaryDataProperties)
         {
             Name = name;
             RequiredUnion = requiredUnion;
@@ -61,8 +61,8 @@ internal Thing(string name, System.BinaryData requiredUnion, ThingRequiredLitera
 
         /// <summary>
         /// Gets or sets the RequiredUnion.
-        /// <para> To assign an object to this property use <see cref="System.BinaryData.FromObjectAsJson{T}(T, Text.Json.JsonSerializerOptions?)"/>. </para>
-        /// <para> To assign an already formatted json string to this property use <see cref="System.BinaryData.FromString(string)"/>. </para>
+        /// <para> To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, JsonSerializerOptions?)"/>. </para>
+        /// <para> To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>. </para>
         /// <para>
         /// <remarks>
         /// Supported types:
@@ -101,7 +101,7 @@ internal Thing(string name, System.BinaryData requiredUnion, ThingRequiredLitera
         /// </list>
         /// </para>
         /// </summary>
-        public System.BinaryData RequiredUnion { get; set; }
+        public BinaryData RequiredUnion { get; set; }
 
         /// <summary> Gets the RequiredLiteralString. </summary>
         public ThingRequiredLiteralString RequiredLiteralString { get; } = "accept";

From 186cf59a4bc7de4a5865d7a9dfceca68ebb1a2d2 Mon Sep 17 00:00:00 2001
From: Wei Hu <huwe@microsoft.com>
Date: Mon, 14 Oct 2024 14:02:52 +0800
Subject: [PATCH 7/7] specify peer dependencies

---
 .../src/Generated/BasicTypeSpecClient.cs      |  60 ++--
 .../Generated/BasicTypeSpecModelFactory.cs    |  94 +++---
 .../Generated/Models/FloatExtensibleEnum.cs   |   2 +-
 .../Models/FloatExtensibleEnumWithIntValue.cs |   2 +-
 .../src/Generated/Models/FloatFixedEnum.cs    |   2 +-
 .../Models/FloatFixedEnumWithIntValue.cs      |   2 +-
 .../src/Generated/Models/Friend.cs            |   4 +-
 .../src/Generated/Models/IntExtensibleEnum.cs |   2 +-
 .../src/Generated/Models/IntFixedEnum.cs      |   2 +-
 .../ModelWithRequiredNullableProperties.cs    |  14 +-
 .../src/Generated/Models/ProjectedModel.cs    |   4 +-
 .../src/Generated/Models/RoundTripModel.cs    |  68 ++---
 .../Generated/Models/StringExtensibleEnum.cs  |   2 +-
 .../src/Generated/Models/StringFixedEnum.cs   |   2 +-
 .../src/Generated/Models/Thing.cs             |  36 +--
 .../Local/Basic-TypeSpec/tspCodeModel.json    |  63 ++++
 .../http-client-csharp/package-lock.json      | 277 +++++++++++-------
 eng/packages/http-client-csharp/package.json  |  22 ++
 18 files changed, 412 insertions(+), 246 deletions(-)

diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.cs
index 8d0bd106c5f4a..e03c8a59348d7 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecClient.cs
@@ -605,19 +605,19 @@ public virtual async Task<ClientResult> AnonymousBodyAsync(BinaryContent content
         }
 
         /// <summary> body parameter without body decorator. </summary>
-        /// <param name="name"></param>
-        /// <param name="requiredUnion"></param>
-        /// <param name="requiredLiteralString"></param>
-        /// <param name="requiredLiteralInt"></param>
-        /// <param name="requiredLiteralFloat"></param>
-        /// <param name="requiredLiteralBool"></param>
-        /// <param name="requiredBadDescription"></param>
-        /// <param name="requiredNullableList"></param>
-        /// <param name="optionalLiteralString"></param>
-        /// <param name="optionalLiteralInt"></param>
-        /// <param name="optionalLiteralFloat"></param>
-        /// <param name="optionalLiteralBool"></param>
-        /// <param name="optionalNullableList"></param>
+        /// <param name="name"> name of the Thing. </param>
+        /// <param name="requiredUnion"> required Union. </param>
+        /// <param name="requiredLiteralString"> required literal string. </param>
+        /// <param name="requiredLiteralInt"> required literal int. </param>
+        /// <param name="requiredLiteralFloat"> required literal float. </param>
+        /// <param name="requiredLiteralBool"> required literal bool. </param>
+        /// <param name="requiredBadDescription"> description with xml &lt;|endoftext|&gt;. </param>
+        /// <param name="requiredNullableList"> required nullable collection. </param>
+        /// <param name="optionalLiteralString"> optional literal string. </param>
+        /// <param name="optionalLiteralInt"> optional literal int. </param>
+        /// <param name="optionalLiteralFloat"> optional literal float. </param>
+        /// <param name="optionalLiteralBool"> optional literal bool. </param>
+        /// <param name="optionalNullableList"> optional nullable collection. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/>, <paramref name="requiredUnion"/> or <paramref name="requiredBadDescription"/> is null. </exception>
         /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         public virtual ClientResult<Thing> AnonymousBody(string name, BinaryData requiredUnion, ThingRequiredLiteralString requiredLiteralString, ThingRequiredLiteralInt requiredLiteralInt, ThingRequiredLiteralFloat requiredLiteralFloat, bool requiredLiteralBool, string requiredBadDescription, IEnumerable<int> requiredNullableList, ThingOptionalLiteralString? optionalLiteralString = default, ThingOptionalLiteralInt? optionalLiteralInt = default, ThingOptionalLiteralFloat? optionalLiteralFloat = default, bool? optionalLiteralBool = default, IEnumerable<int> optionalNullableList = default)
@@ -646,19 +646,19 @@ public virtual ClientResult<Thing> AnonymousBody(string name, BinaryData require
         }
 
         /// <summary> body parameter without body decorator. </summary>
-        /// <param name="name"></param>
-        /// <param name="requiredUnion"></param>
-        /// <param name="requiredLiteralString"></param>
-        /// <param name="requiredLiteralInt"></param>
-        /// <param name="requiredLiteralFloat"></param>
-        /// <param name="requiredLiteralBool"></param>
-        /// <param name="requiredBadDescription"></param>
-        /// <param name="requiredNullableList"></param>
-        /// <param name="optionalLiteralString"></param>
-        /// <param name="optionalLiteralInt"></param>
-        /// <param name="optionalLiteralFloat"></param>
-        /// <param name="optionalLiteralBool"></param>
-        /// <param name="optionalNullableList"></param>
+        /// <param name="name"> name of the Thing. </param>
+        /// <param name="requiredUnion"> required Union. </param>
+        /// <param name="requiredLiteralString"> required literal string. </param>
+        /// <param name="requiredLiteralInt"> required literal int. </param>
+        /// <param name="requiredLiteralFloat"> required literal float. </param>
+        /// <param name="requiredLiteralBool"> required literal bool. </param>
+        /// <param name="requiredBadDescription"> description with xml &lt;|endoftext|&gt;. </param>
+        /// <param name="requiredNullableList"> required nullable collection. </param>
+        /// <param name="optionalLiteralString"> optional literal string. </param>
+        /// <param name="optionalLiteralInt"> optional literal int. </param>
+        /// <param name="optionalLiteralFloat"> optional literal float. </param>
+        /// <param name="optionalLiteralBool"> optional literal bool. </param>
+        /// <param name="optionalNullableList"> optional nullable collection. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/>, <paramref name="requiredUnion"/> or <paramref name="requiredBadDescription"/> is null. </exception>
         /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         public virtual async Task<ClientResult<Thing>> AnonymousBodyAsync(string name, BinaryData requiredUnion, ThingRequiredLiteralString requiredLiteralString, ThingRequiredLiteralInt requiredLiteralInt, ThingRequiredLiteralFloat requiredLiteralFloat, bool requiredLiteralBool, string requiredBadDescription, IEnumerable<int> requiredNullableList, ThingOptionalLiteralString? optionalLiteralString = default, ThingOptionalLiteralInt? optionalLiteralInt = default, ThingOptionalLiteralFloat? optionalLiteralFloat = default, bool? optionalLiteralBool = default, IEnumerable<int> optionalNullableList = default)
@@ -729,7 +729,7 @@ public virtual async Task<ClientResult> FriendlyModelAsync(BinaryContent content
         }
 
         /// <summary> Model can have its friendly name. </summary>
-        /// <param name="name"></param>
+        /// <param name="name"> name of the NotFriend. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/> is null. </exception>
         /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         public virtual ClientResult<Friend> FriendlyModel(string name)
@@ -742,7 +742,7 @@ public virtual ClientResult<Friend> FriendlyModel(string name)
         }
 
         /// <summary> Model can have its friendly name. </summary>
-        /// <param name="name"></param>
+        /// <param name="name"> name of the NotFriend. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/> is null. </exception>
         /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         public virtual async Task<ClientResult<Friend>> FriendlyModelAsync(string name)
@@ -845,7 +845,7 @@ public virtual async Task<ClientResult> ProjectedNameModelAsync(BinaryContent co
         }
 
         /// <summary> Model can have its projected name. </summary>
-        /// <param name="name"></param>
+        /// <param name="name"> name of the ModelWithProjectedName. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/> is null. </exception>
         /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         public virtual ClientResult<ProjectedModel> ProjectedNameModel(string name)
@@ -858,7 +858,7 @@ public virtual ClientResult<ProjectedModel> ProjectedNameModel(string name)
         }
 
         /// <summary> Model can have its projected name. </summary>
-        /// <param name="name"></param>
+        /// <param name="name"> name of the ModelWithProjectedName. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/> is null. </exception>
         /// <exception cref="ClientResultException"> Service returned a non-success status code. </exception>
         public virtual async Task<ClientResult<ProjectedModel>> ProjectedNameModelAsync(string name)
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecModelFactory.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecModelFactory.cs
index d1f46eb445046..b52d06da39c90 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecModelFactory.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/BasicTypeSpecModelFactory.cs
@@ -15,20 +15,20 @@ namespace BasicTypeSpec.Models
     /// <summary> A factory class for creating instances of the models for mocking. </summary>
     public static partial class BasicTypeSpecModelFactory
     {
-        /// <summary> The Thing. </summary>
-        /// <param name="name"></param>
-        /// <param name="requiredUnion"></param>
-        /// <param name="requiredLiteralString"></param>
-        /// <param name="requiredLiteralInt"></param>
-        /// <param name="requiredLiteralFloat"></param>
-        /// <param name="requiredLiteralBool"></param>
-        /// <param name="optionalLiteralString"></param>
-        /// <param name="optionalLiteralInt"></param>
-        /// <param name="optionalLiteralFloat"></param>
-        /// <param name="optionalLiteralBool"></param>
-        /// <param name="requiredBadDescription"></param>
-        /// <param name="optionalNullableList"></param>
-        /// <param name="requiredNullableList"></param>
+        /// <summary> A model with a few properties of literal types. </summary>
+        /// <param name="name"> name of the Thing. </param>
+        /// <param name="requiredUnion"> required Union. </param>
+        /// <param name="requiredLiteralString"> required literal string. </param>
+        /// <param name="requiredLiteralInt"> required literal int. </param>
+        /// <param name="requiredLiteralFloat"> required literal float. </param>
+        /// <param name="requiredLiteralBool"> required literal bool. </param>
+        /// <param name="optionalLiteralString"> optional literal string. </param>
+        /// <param name="optionalLiteralInt"> optional literal int. </param>
+        /// <param name="optionalLiteralFloat"> optional literal float. </param>
+        /// <param name="optionalLiteralBool"> optional literal bool. </param>
+        /// <param name="requiredBadDescription"> description with xml &lt;|endoftext|&gt;. </param>
+        /// <param name="optionalNullableList"> optional nullable collection. </param>
+        /// <param name="requiredNullableList"> required nullable collection. </param>
         /// <returns> A new <see cref="Models.Thing"/> instance for mocking. </returns>
         public static Thing Thing(string name = default, BinaryData requiredUnion = default, ThingRequiredLiteralString requiredLiteralString = default, ThingRequiredLiteralInt requiredLiteralInt = default, ThingRequiredLiteralFloat requiredLiteralFloat = default, bool requiredLiteralBool = default, ThingOptionalLiteralString? optionalLiteralString = default, ThingOptionalLiteralInt? optionalLiteralInt = default, ThingOptionalLiteralFloat? optionalLiteralFloat = default, bool? optionalLiteralBool = default, string requiredBadDescription = default, IEnumerable<int> optionalNullableList = default, IEnumerable<int> requiredNullableList = default)
         {
@@ -52,31 +52,31 @@ public static Thing Thing(string name = default, BinaryData requiredUnion = defa
                 null);
         }
 
-        /// <summary> The RoundTripModel. </summary>
-        /// <param name="requiredString"></param>
-        /// <param name="requiredInt"></param>
-        /// <param name="requiredCollection"></param>
-        /// <param name="requiredDictionary"></param>
-        /// <param name="requiredModel"></param>
-        /// <param name="intExtensibleEnum"></param>
-        /// <param name="intExtensibleEnumCollection"></param>
-        /// <param name="floatExtensibleEnum"></param>
-        /// <param name="floatExtensibleEnumWithIntValue"></param>
-        /// <param name="floatExtensibleEnumCollection"></param>
-        /// <param name="floatFixedEnum"></param>
-        /// <param name="floatFixedEnumWithIntValue"></param>
-        /// <param name="floatFixedEnumCollection"></param>
-        /// <param name="intFixedEnum"></param>
-        /// <param name="intFixedEnumCollection"></param>
-        /// <param name="stringFixedEnum"></param>
-        /// <param name="requiredUnknown"></param>
-        /// <param name="optionalUnknown"></param>
-        /// <param name="requiredRecordUnknown"></param>
-        /// <param name="optionalRecordUnknown"></param>
-        /// <param name="readOnlyRequiredRecordUnknown"></param>
-        /// <param name="readOnlyOptionalRecordUnknown"></param>
-        /// <param name="modelWithRequiredNullable"></param>
-        /// <param name="requiredBytes"></param>
+        /// <summary> this is a roundtrip model. </summary>
+        /// <param name="requiredString"> Required string, illustrating a reference type property. </param>
+        /// <param name="requiredInt"> Required int, illustrating a value type property. </param>
+        /// <param name="requiredCollection"> Required collection of enums. </param>
+        /// <param name="requiredDictionary"> Required dictionary of enums. </param>
+        /// <param name="requiredModel"> Required model. </param>
+        /// <param name="intExtensibleEnum"> this is an int based extensible enum. </param>
+        /// <param name="intExtensibleEnumCollection"> this is a collection of int based extensible enum. </param>
+        /// <param name="floatExtensibleEnum"> this is a float based extensible enum. </param>
+        /// <param name="floatExtensibleEnumWithIntValue"> this is a float based extensible enum. </param>
+        /// <param name="floatExtensibleEnumCollection"> this is a collection of float based extensible enum. </param>
+        /// <param name="floatFixedEnum"> this is a float based fixed enum. </param>
+        /// <param name="floatFixedEnumWithIntValue"> this is a float based fixed enum. </param>
+        /// <param name="floatFixedEnumCollection"> this is a collection of float based fixed enum. </param>
+        /// <param name="intFixedEnum"> this is a int based fixed enum. </param>
+        /// <param name="intFixedEnumCollection"> this is a collection of int based fixed enum. </param>
+        /// <param name="stringFixedEnum"> this is a string based fixed enum. </param>
+        /// <param name="requiredUnknown"> required unknown. </param>
+        /// <param name="optionalUnknown"> optional unknown. </param>
+        /// <param name="requiredRecordUnknown"> required record of unknown. </param>
+        /// <param name="optionalRecordUnknown"> optional record of unknown. </param>
+        /// <param name="readOnlyRequiredRecordUnknown"> required readonly record of unknown. </param>
+        /// <param name="readOnlyOptionalRecordUnknown"> optional readonly record of unknown. </param>
+        /// <param name="modelWithRequiredNullable"> this is a model with required nullable properties. </param>
+        /// <param name="requiredBytes"> Required bytes. </param>
         /// <returns> A new <see cref="Models.RoundTripModel"/> instance for mocking. </returns>
         public static RoundTripModel RoundTripModel(string requiredString = default, int requiredInt = default, IEnumerable<StringFixedEnum> requiredCollection = default, IDictionary<string, StringExtensibleEnum> requiredDictionary = default, Thing requiredModel = default, IntExtensibleEnum? intExtensibleEnum = default, IEnumerable<IntExtensibleEnum> intExtensibleEnumCollection = default, FloatExtensibleEnum? floatExtensibleEnum = default, FloatExtensibleEnumWithIntValue? floatExtensibleEnumWithIntValue = default, IEnumerable<FloatExtensibleEnum> floatExtensibleEnumCollection = default, FloatFixedEnum? floatFixedEnum = default, FloatFixedEnumWithIntValue? floatFixedEnumWithIntValue = default, IEnumerable<FloatFixedEnum> floatFixedEnumCollection = default, IntFixedEnum? intFixedEnum = default, IEnumerable<IntFixedEnum> intFixedEnumCollection = default, StringFixedEnum? stringFixedEnum = default, BinaryData requiredUnknown = default, BinaryData optionalUnknown = default, IDictionary<string, BinaryData> requiredRecordUnknown = default, IDictionary<string, BinaryData> optionalRecordUnknown = default, IReadOnlyDictionary<string, BinaryData> readOnlyRequiredRecordUnknown = default, IReadOnlyDictionary<string, BinaryData> readOnlyOptionalRecordUnknown = default, ModelWithRequiredNullableProperties modelWithRequiredNullable = default, BinaryData requiredBytes = default)
         {
@@ -119,10 +119,10 @@ public static RoundTripModel RoundTripModel(string requiredString = default, int
                 null);
         }
 
-        /// <summary> The ModelWithRequiredNullableProperties. </summary>
-        /// <param name="requiredNullablePrimitive"></param>
-        /// <param name="requiredExtensibleEnum"></param>
-        /// <param name="requiredFixedEnum"></param>
+        /// <summary> A model with a few required nullable properties. </summary>
+        /// <param name="requiredNullablePrimitive"> required nullable primitive type. </param>
+        /// <param name="requiredExtensibleEnum"> required nullable extensible enum type. </param>
+        /// <param name="requiredFixedEnum"> required nullable fixed enum type. </param>
         /// <returns> A new <see cref="Models.ModelWithRequiredNullableProperties"/> instance for mocking. </returns>
         public static ModelWithRequiredNullableProperties ModelWithRequiredNullableProperties(int? requiredNullablePrimitive = default, StringExtensibleEnum? requiredExtensibleEnum = default, StringFixedEnum? requiredFixedEnum = default)
         {
@@ -130,8 +130,8 @@ public static ModelWithRequiredNullableProperties ModelWithRequiredNullablePrope
             return new ModelWithRequiredNullableProperties(requiredNullablePrimitive, requiredExtensibleEnum, requiredFixedEnum, null);
         }
 
-        /// <summary> The Friend. </summary>
-        /// <param name="name"></param>
+        /// <summary> this is not a friendly model but with a friendly name. </summary>
+        /// <param name="name"> name of the NotFriend. </param>
         /// <returns> A new <see cref="Models.Friend"/> instance for mocking. </returns>
         public static Friend Friend(string name = default)
         {
@@ -139,8 +139,8 @@ public static Friend Friend(string name = default)
             return new Friend(name, null);
         }
 
-        /// <summary> The ProjectedModel. </summary>
-        /// <param name="name"></param>
+        /// <summary> this is a model with a projected name. </summary>
+        /// <param name="name"> name of the ModelWithProjectedName. </param>
         /// <returns> A new <see cref="Models.ProjectedModel"/> instance for mocking. </returns>
         public static ProjectedModel ProjectedModel(string name = default)
         {
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatExtensibleEnum.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatExtensibleEnum.cs
index 6585e3f5319d8..1ea90f23f92bf 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatExtensibleEnum.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatExtensibleEnum.cs
@@ -11,7 +11,7 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary></summary>
+    /// <summary> Float based extensible enum. </summary>
     public readonly partial struct FloatExtensibleEnum : IEquatable<FloatExtensibleEnum>
     {
         private readonly float _value;
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatExtensibleEnumWithIntValue.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatExtensibleEnumWithIntValue.cs
index 9082934a43f6a..021f057db2cd8 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatExtensibleEnumWithIntValue.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatExtensibleEnumWithIntValue.cs
@@ -11,7 +11,7 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary></summary>
+    /// <summary> float fixed enum. </summary>
     public readonly partial struct FloatExtensibleEnumWithIntValue : IEquatable<FloatExtensibleEnumWithIntValue>
     {
         private readonly float _value;
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatFixedEnum.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatFixedEnum.cs
index 0f084aca262ba..3fb7df3312008 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatFixedEnum.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatFixedEnum.cs
@@ -7,7 +7,7 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary></summary>
+    /// <summary> float fixed enum. </summary>
     public enum FloatFixedEnum
     {
         /// <summary> OneDotOne. </summary>
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatFixedEnumWithIntValue.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatFixedEnumWithIntValue.cs
index 566c1c83ff8dd..b29e7c2c7941c 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatFixedEnumWithIntValue.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/FloatFixedEnumWithIntValue.cs
@@ -7,7 +7,7 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary></summary>
+    /// <summary> float fixed enum. </summary>
     public enum FloatFixedEnumWithIntValue
     {
         /// <summary> One. </summary>
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Friend.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Friend.cs
index c31b434087bad..ea7b538f4377d 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Friend.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Friend.cs
@@ -10,7 +10,7 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary> The Friend. </summary>
+    /// <summary> this is not a friendly model but with a friendly name. </summary>
     public partial class Friend
     {
         /// <summary> Keeps track of any properties unknown to the library. </summary>
@@ -27,7 +27,7 @@ internal Friend(string name, IDictionary<string, BinaryData> additionalBinaryDat
             _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
-        /// <summary> Gets or sets the Name. </summary>
+        /// <summary> name of the NotFriend. </summary>
         public string Name { get; set; }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/IntExtensibleEnum.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/IntExtensibleEnum.cs
index 74d793b07ad22..70662256d1a8d 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/IntExtensibleEnum.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/IntExtensibleEnum.cs
@@ -11,7 +11,7 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary></summary>
+    /// <summary> Int based extensible enum. </summary>
     public readonly partial struct IntExtensibleEnum : IEquatable<IntExtensibleEnum>
     {
         private readonly int _value;
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/IntFixedEnum.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/IntFixedEnum.cs
index 1b63303cdb2a3..8e88904ce2c57 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/IntFixedEnum.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/IntFixedEnum.cs
@@ -7,7 +7,7 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary></summary>
+    /// <summary> int fixed enum. </summary>
     public enum IntFixedEnum
     {
         /// <summary> One. </summary>
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.cs
index 6900f22f7b014..3f743baad339c 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ModelWithRequiredNullableProperties.cs
@@ -10,16 +10,16 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary> The ModelWithRequiredNullableProperties. </summary>
+    /// <summary> A model with a few required nullable properties. </summary>
     public partial class ModelWithRequiredNullableProperties
     {
         /// <summary> Keeps track of any properties unknown to the library. </summary>
         private protected IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="ModelWithRequiredNullableProperties"/>. </summary>
-        /// <param name="requiredNullablePrimitive"></param>
-        /// <param name="requiredExtensibleEnum"></param>
-        /// <param name="requiredFixedEnum"></param>
+        /// <param name="requiredNullablePrimitive"> required nullable primitive type. </param>
+        /// <param name="requiredExtensibleEnum"> required nullable extensible enum type. </param>
+        /// <param name="requiredFixedEnum"> required nullable fixed enum type. </param>
         public ModelWithRequiredNullableProperties(int? requiredNullablePrimitive, StringExtensibleEnum? requiredExtensibleEnum, StringFixedEnum? requiredFixedEnum)
         {
             RequiredNullablePrimitive = requiredNullablePrimitive;
@@ -35,13 +35,13 @@ internal ModelWithRequiredNullableProperties(int? requiredNullablePrimitive, Str
             _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
-        /// <summary> Gets or sets the RequiredNullablePrimitive. </summary>
+        /// <summary> required nullable primitive type. </summary>
         public int? RequiredNullablePrimitive { get; set; }
 
-        /// <summary> Gets or sets the RequiredExtensibleEnum. </summary>
+        /// <summary> required nullable extensible enum type. </summary>
         public StringExtensibleEnum? RequiredExtensibleEnum { get; set; }
 
-        /// <summary> Gets or sets the RequiredFixedEnum. </summary>
+        /// <summary> required nullable fixed enum type. </summary>
         public StringFixedEnum? RequiredFixedEnum { get; set; }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedModel.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedModel.cs
index 93953c73bf5e4..d9a5e5895d01a 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedModel.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/ProjectedModel.cs
@@ -10,7 +10,7 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary> The ProjectedModel. </summary>
+    /// <summary> this is a model with a projected name. </summary>
     public partial class ProjectedModel
     {
         /// <summary> Keeps track of any properties unknown to the library. </summary>
@@ -27,7 +27,7 @@ internal ProjectedModel(string name, IDictionary<string, BinaryData> additionalB
             _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
-        /// <summary> Gets or sets the Name. </summary>
+        /// <summary> name of the ModelWithProjectedName. </summary>
         public string Name { get; set; }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/RoundTripModel.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/RoundTripModel.cs
index c4b65911d127f..771f0b16040e9 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/RoundTripModel.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/RoundTripModel.cs
@@ -13,22 +13,22 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary> The RoundTripModel. </summary>
+    /// <summary> this is a roundtrip model. </summary>
     public partial class RoundTripModel
     {
         /// <summary> Keeps track of any properties unknown to the library. </summary>
         private protected IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="RoundTripModel"/>. </summary>
-        /// <param name="requiredString"></param>
-        /// <param name="requiredInt"></param>
-        /// <param name="requiredCollection"></param>
-        /// <param name="requiredDictionary"></param>
-        /// <param name="requiredModel"></param>
-        /// <param name="requiredUnknown"></param>
-        /// <param name="requiredRecordUnknown"></param>
-        /// <param name="modelWithRequiredNullable"></param>
-        /// <param name="requiredBytes"></param>
+        /// <param name="requiredString"> Required string, illustrating a reference type property. </param>
+        /// <param name="requiredInt"> Required int, illustrating a value type property. </param>
+        /// <param name="requiredCollection"> Required collection of enums. </param>
+        /// <param name="requiredDictionary"> Required dictionary of enums. </param>
+        /// <param name="requiredModel"> Required model. </param>
+        /// <param name="requiredUnknown"> required unknown. </param>
+        /// <param name="requiredRecordUnknown"> required record of unknown. </param>
+        /// <param name="modelWithRequiredNullable"> this is a model with required nullable properties. </param>
+        /// <param name="requiredBytes"> Required bytes. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="requiredString"/>, <paramref name="requiredCollection"/>, <paramref name="requiredDictionary"/>, <paramref name="requiredModel"/>, <paramref name="requiredUnknown"/>, <paramref name="requiredRecordUnknown"/>, <paramref name="modelWithRequiredNullable"/> or <paramref name="requiredBytes"/> is null. </exception>
         public RoundTripModel(string requiredString, int requiredInt, IEnumerable<StringFixedEnum> requiredCollection, IDictionary<string, StringExtensibleEnum> requiredDictionary, Thing requiredModel, BinaryData requiredUnknown, IDictionary<string, BinaryData> requiredRecordUnknown, ModelWithRequiredNullableProperties modelWithRequiredNullable, BinaryData requiredBytes)
         {
@@ -88,56 +88,56 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
             _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
-        /// <summary> Gets or sets the RequiredString. </summary>
+        /// <summary> Required string, illustrating a reference type property. </summary>
         public string RequiredString { get; set; }
 
-        /// <summary> Gets or sets the RequiredInt. </summary>
+        /// <summary> Required int, illustrating a value type property. </summary>
         public int RequiredInt { get; set; }
 
-        /// <summary> Gets the RequiredCollection. </summary>
+        /// <summary> Required collection of enums. </summary>
         public IList<StringFixedEnum> RequiredCollection { get; }
 
-        /// <summary> Gets the RequiredDictionary. </summary>
+        /// <summary> Required dictionary of enums. </summary>
         public IDictionary<string, StringExtensibleEnum> RequiredDictionary { get; }
 
-        /// <summary> Gets or sets the RequiredModel. </summary>
+        /// <summary> Required model. </summary>
         public Thing RequiredModel { get; set; }
 
-        /// <summary> Gets or sets the IntExtensibleEnum. </summary>
+        /// <summary> this is an int based extensible enum. </summary>
         public IntExtensibleEnum? IntExtensibleEnum { get; set; }
 
-        /// <summary> Gets the IntExtensibleEnumCollection. </summary>
+        /// <summary> this is a collection of int based extensible enum. </summary>
         public IList<IntExtensibleEnum> IntExtensibleEnumCollection { get; }
 
-        /// <summary> Gets or sets the FloatExtensibleEnum. </summary>
+        /// <summary> this is a float based extensible enum. </summary>
         public FloatExtensibleEnum? FloatExtensibleEnum { get; set; }
 
-        /// <summary> Gets or sets the FloatExtensibleEnumWithIntValue. </summary>
+        /// <summary> this is a float based extensible enum. </summary>
         public FloatExtensibleEnumWithIntValue? FloatExtensibleEnumWithIntValue { get; set; }
 
-        /// <summary> Gets the FloatExtensibleEnumCollection. </summary>
+        /// <summary> this is a collection of float based extensible enum. </summary>
         public IList<FloatExtensibleEnum> FloatExtensibleEnumCollection { get; }
 
-        /// <summary> Gets or sets the FloatFixedEnum. </summary>
+        /// <summary> this is a float based fixed enum. </summary>
         public FloatFixedEnum? FloatFixedEnum { get; set; }
 
-        /// <summary> Gets or sets the FloatFixedEnumWithIntValue. </summary>
+        /// <summary> this is a float based fixed enum. </summary>
         public FloatFixedEnumWithIntValue? FloatFixedEnumWithIntValue { get; set; }
 
-        /// <summary> Gets the FloatFixedEnumCollection. </summary>
+        /// <summary> this is a collection of float based fixed enum. </summary>
         public IList<FloatFixedEnum> FloatFixedEnumCollection { get; }
 
-        /// <summary> Gets or sets the IntFixedEnum. </summary>
+        /// <summary> this is a int based fixed enum. </summary>
         public IntFixedEnum? IntFixedEnum { get; set; }
 
-        /// <summary> Gets the IntFixedEnumCollection. </summary>
+        /// <summary> this is a collection of int based fixed enum. </summary>
         public IList<IntFixedEnum> IntFixedEnumCollection { get; }
 
-        /// <summary> Gets or sets the StringFixedEnum. </summary>
+        /// <summary> this is a string based fixed enum. </summary>
         public StringFixedEnum? StringFixedEnum { get; set; }
 
         /// <summary>
-        /// Gets or sets the RequiredUnknown.
+        /// required unknown
         /// <para> To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, JsonSerializerOptions?)"/>. </para>
         /// <para> To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>. </para>
         /// <para>
@@ -165,7 +165,7 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
         public BinaryData RequiredUnknown { get; set; }
 
         /// <summary>
-        /// Gets or sets the OptionalUnknown.
+        /// optional unknown
         /// <para> To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, JsonSerializerOptions?)"/>. </para>
         /// <para> To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>. </para>
         /// <para>
@@ -193,7 +193,7 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
         public BinaryData OptionalUnknown { get; set; }
 
         /// <summary>
-        /// Gets the RequiredRecordUnknown.
+        /// required record of unknown
         /// <para> To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, JsonSerializerOptions?)"/>. </para>
         /// <para> To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>. </para>
         /// <para>
@@ -221,7 +221,7 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
         public IDictionary<string, BinaryData> RequiredRecordUnknown { get; }
 
         /// <summary>
-        /// Gets the OptionalRecordUnknown.
+        /// optional record of unknown
         /// <para> To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, JsonSerializerOptions?)"/>. </para>
         /// <para> To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>. </para>
         /// <para>
@@ -249,7 +249,7 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
         public IDictionary<string, BinaryData> OptionalRecordUnknown { get; }
 
         /// <summary>
-        /// Gets the ReadOnlyRequiredRecordUnknown.
+        /// required readonly record of unknown
         /// <para> To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, JsonSerializerOptions?)"/>. </para>
         /// <para> To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>. </para>
         /// <para>
@@ -277,7 +277,7 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
         public IReadOnlyDictionary<string, BinaryData> ReadOnlyRequiredRecordUnknown { get; }
 
         /// <summary>
-        /// Gets the ReadOnlyOptionalRecordUnknown.
+        /// optional readonly record of unknown
         /// <para> To assign an object to the value of this property use <see cref="BinaryData.FromObjectAsJson{T}(T, JsonSerializerOptions?)"/>. </para>
         /// <para> To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>. </para>
         /// <para>
@@ -304,11 +304,11 @@ internal RoundTripModel(string requiredString, int requiredInt, IList<StringFixe
         /// </summary>
         public IReadOnlyDictionary<string, BinaryData> ReadOnlyOptionalRecordUnknown { get; }
 
-        /// <summary> Gets or sets the ModelWithRequiredNullable. </summary>
+        /// <summary> this is a model with required nullable properties. </summary>
         public ModelWithRequiredNullableProperties ModelWithRequiredNullable { get; set; }
 
         /// <summary>
-        /// Gets or sets the RequiredBytes.
+        /// Required bytes
         /// <para>
         /// To assign a byte[] to this property use <see cref="BinaryData.FromBytes(byte[])"/>.
         /// The byte[] will be serialized to a Base64 encoded string.
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/StringExtensibleEnum.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/StringExtensibleEnum.cs
index 763a97b0ca187..a2c32dfebf119 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/StringExtensibleEnum.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/StringExtensibleEnum.cs
@@ -11,7 +11,7 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary></summary>
+    /// <summary> Extensible enum. </summary>
     public readonly partial struct StringExtensibleEnum : IEquatable<StringExtensibleEnum>
     {
         private readonly string _value;
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/StringFixedEnum.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/StringFixedEnum.cs
index bdd58124021cb..8144ab9aa5b5b 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/StringFixedEnum.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/StringFixedEnum.cs
@@ -7,7 +7,7 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary></summary>
+    /// <summary> Simple enum. </summary>
     public enum StringFixedEnum
     {
         /// <summary> One. </summary>
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Thing.cs b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Thing.cs
index b4f1ac523b8a6..c35fd826366ef 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Thing.cs
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/src/Generated/Models/Thing.cs
@@ -13,17 +13,17 @@
 
 namespace BasicTypeSpec.Models
 {
-    /// <summary> The Thing. </summary>
+    /// <summary> A model with a few properties of literal types. </summary>
     public partial class Thing
     {
         /// <summary> Keeps track of any properties unknown to the library. </summary>
         private protected IDictionary<string, BinaryData> _additionalBinaryDataProperties;
 
         /// <summary> Initializes a new instance of <see cref="Thing"/>. </summary>
-        /// <param name="name"></param>
-        /// <param name="requiredUnion"></param>
-        /// <param name="requiredBadDescription"></param>
-        /// <param name="requiredNullableList"></param>
+        /// <param name="name"> name of the Thing. </param>
+        /// <param name="requiredUnion"> required Union. </param>
+        /// <param name="requiredBadDescription"> description with xml &lt;|endoftext|&gt;. </param>
+        /// <param name="requiredNullableList"> required nullable collection. </param>
         /// <exception cref="ArgumentNullException"> <paramref name="name"/>, <paramref name="requiredUnion"/> or <paramref name="requiredBadDescription"/> is null. </exception>
         public Thing(string name, BinaryData requiredUnion, string requiredBadDescription, IEnumerable<int> requiredNullableList)
         {
@@ -56,11 +56,11 @@ internal Thing(string name, BinaryData requiredUnion, ThingRequiredLiteralString
             _additionalBinaryDataProperties = additionalBinaryDataProperties;
         }
 
-        /// <summary> Gets or sets the Name. </summary>
+        /// <summary> name of the Thing. </summary>
         public string Name { get; set; }
 
         /// <summary>
-        /// Gets or sets the RequiredUnion.
+        /// required Union
         /// <para> To assign an object to this property use <see cref="BinaryData.FromObjectAsJson{T}(T, JsonSerializerOptions?)"/>. </para>
         /// <para> To assign an already formatted json string to this property use <see cref="BinaryData.FromString(string)"/>. </para>
         /// <para>
@@ -103,37 +103,37 @@ internal Thing(string name, BinaryData requiredUnion, ThingRequiredLiteralString
         /// </summary>
         public BinaryData RequiredUnion { get; set; }
 
-        /// <summary> Gets the RequiredLiteralString. </summary>
+        /// <summary> required literal string. </summary>
         public ThingRequiredLiteralString RequiredLiteralString { get; } = "accept";
 
-        /// <summary> Gets the RequiredLiteralInt. </summary>
+        /// <summary> required literal int. </summary>
         public ThingRequiredLiteralInt RequiredLiteralInt { get; } = 123;
 
-        /// <summary> Gets the RequiredLiteralFloat. </summary>
+        /// <summary> required literal float. </summary>
         public ThingRequiredLiteralFloat RequiredLiteralFloat { get; } = 1.23F;
 
-        /// <summary> Gets the RequiredLiteralBool. </summary>
+        /// <summary> required literal bool. </summary>
         public bool RequiredLiteralBool { get; } = false;
 
-        /// <summary> Gets or sets the OptionalLiteralString. </summary>
+        /// <summary> optional literal string. </summary>
         public ThingOptionalLiteralString? OptionalLiteralString { get; set; }
 
-        /// <summary> Gets or sets the OptionalLiteralInt. </summary>
+        /// <summary> optional literal int. </summary>
         public ThingOptionalLiteralInt? OptionalLiteralInt { get; set; }
 
-        /// <summary> Gets or sets the OptionalLiteralFloat. </summary>
+        /// <summary> optional literal float. </summary>
         public ThingOptionalLiteralFloat? OptionalLiteralFloat { get; set; }
 
-        /// <summary> Gets or sets the OptionalLiteralBool. </summary>
+        /// <summary> optional literal bool. </summary>
         public bool? OptionalLiteralBool { get; set; }
 
-        /// <summary> Gets or sets the RequiredBadDescription. </summary>
+        /// <summary> description with xml &lt;|endoftext|&gt;. </summary>
         public string RequiredBadDescription { get; set; }
 
-        /// <summary> Gets or sets the OptionalNullableList. </summary>
+        /// <summary> optional nullable collection. </summary>
         public IList<int> OptionalNullableList { get; set; }
 
-        /// <summary> Gets or sets the RequiredNullableList. </summary>
+        /// <summary> required nullable collection. </summary>
         public IList<int> RequiredNullableList { get; set; }
     }
 }
diff --git a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/tspCodeModel.json b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/tspCodeModel.json
index 3ae6e337dd17e..ff55ddfccd667 100644
--- a/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/tspCodeModel.json
+++ b/eng/packages/http-client-csharp/generator/TestProjects/Local/Basic-TypeSpec/tspCodeModel.json
@@ -269,6 +269,7 @@
      "decorators": []
     }
    ],
+   "description": "Simple enum",
    "isFixed": true,
    "isFlags": false,
    "usage": "Input,Output,Json",
@@ -339,6 +340,7 @@
      "decorators": []
     }
    ],
+   "description": "Extensible enum",
    "isFixed": false,
    "isFlags": false,
    "usage": "Input,Output,Json",
@@ -409,6 +411,7 @@
      "decorators": []
     }
    ],
+   "description": "Int based extensible enum",
    "isFixed": false,
    "isFlags": false,
    "usage": "Input,Output,Json",
@@ -479,6 +482,7 @@
      "decorators": []
     }
    ],
+   "description": "Float based extensible enum",
    "isFixed": false,
    "isFlags": false,
    "usage": "Input,Output,Json",
@@ -549,6 +553,7 @@
      "decorators": []
     }
    ],
+   "description": "float fixed enum",
    "isFixed": false,
    "isFlags": false,
    "usage": "Input,Output,Json",
@@ -619,6 +624,7 @@
      "decorators": []
     }
    ],
+   "description": "float fixed enum",
    "isFixed": true,
    "isFlags": false,
    "usage": "Input,Output,Json",
@@ -689,6 +695,7 @@
      "decorators": []
     }
    ],
+   "description": "float fixed enum",
    "isFixed": true,
    "isFlags": false,
    "usage": "Input,Output,Json",
@@ -759,6 +766,7 @@
      "decorators": []
     }
    ],
+   "description": "int fixed enum",
    "isFixed": true,
    "isFlags": false,
    "usage": "Input,Output,Json",
@@ -825,6 +833,7 @@
    "name": "Thing",
    "crossLanguageDefinitionId": "BasicTypeSpec.Thing",
    "usage": "Input,Output,Spread,Json",
+   "description": "A model with a few properties of literal types",
    "decorators": [],
    "properties": [
     {
@@ -832,6 +841,7 @@
      "kind": "property",
      "name": "name",
      "serializedName": "name",
+     "description": "name of the Thing",
      "type": {
       "$id": "92",
       "kind": "string",
@@ -851,6 +861,7 @@
      "kind": "property",
      "name": "requiredUnion",
      "serializedName": "requiredUnion",
+     "description": "required Union",
      "type": {
       "$id": "94",
       "kind": "union",
@@ -899,6 +910,7 @@
      "kind": "property",
      "name": "requiredLiteralString",
      "serializedName": "requiredLiteralString",
+     "description": "required literal string",
      "type": {
       "$id": "100",
       "kind": "constant",
@@ -920,6 +932,7 @@
      "kind": "property",
      "name": "requiredLiteralInt",
      "serializedName": "requiredLiteralInt",
+     "description": "required literal int",
      "type": {
       "$id": "102",
       "kind": "constant",
@@ -941,6 +954,7 @@
      "kind": "property",
      "name": "requiredLiteralFloat",
      "serializedName": "requiredLiteralFloat",
+     "description": "required literal float",
      "type": {
       "$id": "104",
       "kind": "constant",
@@ -962,6 +976,7 @@
      "kind": "property",
      "name": "requiredLiteralBool",
      "serializedName": "requiredLiteralBool",
+     "description": "required literal bool",
      "type": {
       "$id": "106",
       "kind": "constant",
@@ -987,6 +1002,7 @@
      "kind": "property",
      "name": "optionalLiteralString",
      "serializedName": "optionalLiteralString",
+     "description": "optional literal string",
      "type": {
       "$id": "109",
       "kind": "constant",
@@ -1008,6 +1024,7 @@
      "kind": "property",
      "name": "optionalLiteralInt",
      "serializedName": "optionalLiteralInt",
+     "description": "optional literal int",
      "type": {
       "$id": "111",
       "kind": "constant",
@@ -1029,6 +1046,7 @@
      "kind": "property",
      "name": "optionalLiteralFloat",
      "serializedName": "optionalLiteralFloat",
+     "description": "optional literal float",
      "type": {
       "$id": "113",
       "kind": "constant",
@@ -1050,6 +1068,7 @@
      "kind": "property",
      "name": "optionalLiteralBool",
      "serializedName": "optionalLiteralBool",
+     "description": "optional literal bool",
      "type": {
       "$id": "115",
       "kind": "constant",
@@ -1075,6 +1094,7 @@
      "kind": "property",
      "name": "requiredBadDescription",
      "serializedName": "requiredBadDescription",
+     "description": "description with xml <|endoftext|>",
      "type": {
       "$id": "118",
       "kind": "string",
@@ -1094,6 +1114,7 @@
      "kind": "property",
      "name": "optionalNullableList",
      "serializedName": "optionalNullableList",
+     "description": "optional nullable collection",
      "type": {
       "$id": "120",
       "kind": "nullable",
@@ -1124,6 +1145,7 @@
      "kind": "property",
      "name": "requiredNullableList",
      "serializedName": "requiredNullableList",
+     "description": "required nullable collection",
      "type": {
       "$id": "124",
       "kind": "nullable",
@@ -1157,6 +1179,7 @@
    "name": "RoundTripModel",
    "crossLanguageDefinitionId": "BasicTypeSpec.RoundTripModel",
    "usage": "Input,Output,Json",
+   "description": "this is a roundtrip model",
    "decorators": [],
    "properties": [
     {
@@ -1164,6 +1187,7 @@
      "kind": "property",
      "name": "requiredString",
      "serializedName": "requiredString",
+     "description": "Required string, illustrating a reference type property.",
      "type": {
       "$id": "129",
       "kind": "string",
@@ -1183,6 +1207,7 @@
      "kind": "property",
      "name": "requiredInt",
      "serializedName": "requiredInt",
+     "description": "Required int, illustrating a value type property.",
      "type": {
       "$id": "131",
       "kind": "int32",
@@ -1202,6 +1227,7 @@
      "kind": "property",
      "name": "requiredCollection",
      "serializedName": "requiredCollection",
+     "description": "Required collection of enums",
      "type": {
       "$id": "133",
       "kind": "array",
@@ -1224,6 +1250,7 @@
      "kind": "property",
      "name": "requiredDictionary",
      "serializedName": "requiredDictionary",
+     "description": "Required dictionary of enums",
      "type": {
       "$id": "135",
       "kind": "dict",
@@ -1251,6 +1278,7 @@
      "kind": "property",
      "name": "requiredModel",
      "serializedName": "requiredModel",
+     "description": "Required model",
      "type": {
       "$ref": "90"
      },
@@ -1266,6 +1294,7 @@
      "kind": "property",
      "name": "intExtensibleEnum",
      "serializedName": "intExtensibleEnum",
+     "description": "this is an int based extensible enum",
      "type": {
       "$ref": "36"
      },
@@ -1281,6 +1310,7 @@
      "kind": "property",
      "name": "intExtensibleEnumCollection",
      "serializedName": "intExtensibleEnumCollection",
+     "description": "this is a collection of int based extensible enum",
      "type": {
       "$id": "140",
       "kind": "array",
@@ -1303,6 +1333,7 @@
      "kind": "property",
      "name": "floatExtensibleEnum",
      "serializedName": "floatExtensibleEnum",
+     "description": "this is a float based extensible enum",
      "type": {
       "$ref": "44"
      },
@@ -1318,6 +1349,7 @@
      "kind": "property",
      "name": "floatExtensibleEnumWithIntValue",
      "serializedName": "floatExtensibleEnumWithIntValue",
+     "description": "this is a float based extensible enum",
      "type": {
       "$ref": "52"
      },
@@ -1333,6 +1365,7 @@
      "kind": "property",
      "name": "floatExtensibleEnumCollection",
      "serializedName": "floatExtensibleEnumCollection",
+     "description": "this is a collection of float based extensible enum",
      "type": {
       "$id": "144",
       "kind": "array",
@@ -1355,6 +1388,7 @@
      "kind": "property",
      "name": "floatFixedEnum",
      "serializedName": "floatFixedEnum",
+     "description": "this is a float based fixed enum",
      "type": {
       "$ref": "60"
      },
@@ -1370,6 +1404,7 @@
      "kind": "property",
      "name": "floatFixedEnumWithIntValue",
      "serializedName": "floatFixedEnumWithIntValue",
+     "description": "this is a float based fixed enum",
      "type": {
       "$ref": "68"
      },
@@ -1385,6 +1420,7 @@
      "kind": "property",
      "name": "floatFixedEnumCollection",
      "serializedName": "floatFixedEnumCollection",
+     "description": "this is a collection of float based fixed enum",
      "type": {
       "$id": "148",
       "kind": "array",
@@ -1407,6 +1443,7 @@
      "kind": "property",
      "name": "intFixedEnum",
      "serializedName": "intFixedEnum",
+     "description": "this is a int based fixed enum",
      "type": {
       "$ref": "76"
      },
@@ -1422,6 +1459,7 @@
      "kind": "property",
      "name": "intFixedEnumCollection",
      "serializedName": "intFixedEnumCollection",
+     "description": "this is a collection of int based fixed enum",
      "type": {
       "$id": "151",
       "kind": "array",
@@ -1444,6 +1482,7 @@
      "kind": "property",
      "name": "stringFixedEnum",
      "serializedName": "stringFixedEnum",
+     "description": "this is a string based fixed enum",
      "type": {
       "$ref": "20"
      },
@@ -1459,6 +1498,7 @@
      "kind": "property",
      "name": "requiredUnknown",
      "serializedName": "requiredUnknown",
+     "description": "required unknown",
      "type": {
       "$id": "154",
       "kind": "unknown",
@@ -1478,6 +1518,7 @@
      "kind": "property",
      "name": "optionalUnknown",
      "serializedName": "optionalUnknown",
+     "description": "optional unknown",
      "type": {
       "$id": "156",
       "kind": "unknown",
@@ -1497,6 +1538,7 @@
      "kind": "property",
      "name": "requiredRecordUnknown",
      "serializedName": "requiredRecordUnknown",
+     "description": "required record of unknown",
      "type": {
       "$id": "158",
       "kind": "dict",
@@ -1528,6 +1570,7 @@
      "kind": "property",
      "name": "optionalRecordUnknown",
      "serializedName": "optionalRecordUnknown",
+     "description": "optional record of unknown",
      "type": {
       "$id": "162",
       "kind": "dict",
@@ -1559,6 +1602,7 @@
      "kind": "property",
      "name": "readOnlyRequiredRecordUnknown",
      "serializedName": "readOnlyRequiredRecordUnknown",
+     "description": "required readonly record of unknown",
      "type": {
       "$id": "166",
       "kind": "dict",
@@ -1590,6 +1634,7 @@
      "kind": "property",
      "name": "readOnlyOptionalRecordUnknown",
      "serializedName": "readOnlyOptionalRecordUnknown",
+     "description": "optional readonly record of unknown",
      "type": {
       "$id": "170",
       "kind": "dict",
@@ -1621,12 +1666,14 @@
      "kind": "property",
      "name": "modelWithRequiredNullable",
      "serializedName": "modelWithRequiredNullable",
+     "description": "this is a model with required nullable properties",
      "type": {
       "$id": "174",
       "kind": "model",
       "name": "ModelWithRequiredNullableProperties",
       "crossLanguageDefinitionId": "BasicTypeSpec.ModelWithRequiredNullableProperties",
       "usage": "Input,Output,Json",
+      "description": "A model with a few required nullable properties",
       "decorators": [],
       "properties": [
        {
@@ -1634,6 +1681,7 @@
         "kind": "property",
         "name": "requiredNullablePrimitive",
         "serializedName": "requiredNullablePrimitive",
+        "description": "required nullable primitive type",
         "type": {
          "$id": "176",
          "kind": "nullable",
@@ -1657,6 +1705,7 @@
         "kind": "property",
         "name": "requiredExtensibleEnum",
         "serializedName": "requiredExtensibleEnum",
+        "description": "required nullable extensible enum type",
         "type": {
          "$id": "179",
          "kind": "nullable",
@@ -1676,6 +1725,7 @@
         "kind": "property",
         "name": "requiredFixedEnum",
         "serializedName": "requiredFixedEnum",
+        "description": "required nullable fixed enum type",
         "type": {
          "$id": "181",
          "kind": "nullable",
@@ -1704,6 +1754,7 @@
      "kind": "property",
      "name": "requiredBytes",
      "serializedName": "requiredBytes",
+     "description": "Required bytes",
      "type": {
       "$id": "183",
       "kind": "bytes",
@@ -1730,6 +1781,7 @@
    "name": "Friend",
    "crossLanguageDefinitionId": "BasicTypeSpec.NotFriend",
    "usage": "Output,Spread,Json",
+   "description": "this is not a friendly model but with a friendly name",
    "decorators": [],
    "properties": [
     {
@@ -1737,6 +1789,7 @@
      "kind": "property",
      "name": "name",
      "serializedName": "name",
+     "description": "name of the NotFriend",
      "type": {
       "$id": "186",
       "kind": "string",
@@ -1759,6 +1812,7 @@
    "name": "ProjectedModel",
    "crossLanguageDefinitionId": "BasicTypeSpec.ModelWithProjectedName",
    "usage": "Output,Spread,Json",
+   "description": "this is a model with a projected name",
    "decorators": [],
    "properties": [
     {
@@ -1766,6 +1820,7 @@
      "kind": "property",
      "name": "name",
      "serializedName": "name",
+     "description": "name of the ModelWithProjectedName",
      "type": {
       "$id": "189",
       "kind": "string",
@@ -1796,6 +1851,7 @@
   {
    "$id": "191",
    "Name": "BasicTypeSpecClient",
+   "Description": "This is a sample typespec project.",
    "Operations": [
     {
      "$id": "192",
@@ -2152,6 +2208,7 @@
        "$id": "223",
        "Name": "contentType",
        "NameInRequest": "Content-Type",
+       "Description": "Body parameter's content type. Known values are application/json",
        "Type": {
         "$id": "224",
         "kind": "constant",
@@ -2329,6 +2386,7 @@
        "$id": "237",
        "Name": "contentType",
        "NameInRequest": "Content-Type",
+       "Description": "Body parameter's content type. Known values are application/json",
        "Type": {
         "$id": "238",
         "kind": "constant",
@@ -2746,6 +2804,7 @@
        "$id": "273",
        "Name": "contentType",
        "NameInRequest": "Content-Type",
+       "Description": "Body parameter's content type. Known values are application/json",
        "Type": {
         "$id": "274",
         "kind": "constant",
@@ -2858,6 +2917,7 @@
        "$id": "282",
        "Name": "contentType",
        "NameInRequest": "Content-Type",
+       "Description": "Body parameter's content type. Known values are application/json",
        "Type": {
         "$id": "283",
         "kind": "constant",
@@ -2970,6 +3030,7 @@
        "$id": "291",
        "Name": "contentType",
        "NameInRequest": "Content-Type",
+       "Description": "Body parameter's content type. Known values are application/json",
        "Type": {
         "$id": "292",
         "kind": "constant",
@@ -3142,6 +3203,7 @@
        "$id": "305",
        "Name": "contentType",
        "NameInRequest": "Content-Type",
+       "Description": "Body parameter's content type. Known values are application/json",
        "Type": {
         "$id": "306",
         "kind": "constant",
@@ -3395,6 +3457,7 @@
        "$id": "325",
        "Name": "contentType",
        "NameInRequest": "Content-Type",
+       "Description": "Body parameter's content type. Known values are application/json",
        "Type": {
         "$id": "326",
         "kind": "constant",
diff --git a/eng/packages/http-client-csharp/package-lock.json b/eng/packages/http-client-csharp/package-lock.json
index f4961bcabc602..1f4fb56b374c5 100644
--- a/eng/packages/http-client-csharp/package-lock.json
+++ b/eng/packages/http-client-csharp/package-lock.json
@@ -11,9 +11,22 @@
         "@typespec/http-client-csharp": "0.1.9-alpha.20241010.1"
       },
       "devDependencies": {
+        "@azure-tools/typespec-autorest": "0.46.0",
+        "@azure-tools/typespec-azure-core": "0.46.0",
+        "@azure-tools/typespec-azure-resource-manager": "0.46.1",
+        "@azure-tools/typespec-azure-rulesets": "0.46.0",
+        "@azure-tools/typespec-client-generator-core": "0.46.2",
         "@eslint/js": "^9.2.0",
         "@types/node": "~22.7.5",
         "@types/prettier": "^2.6.3",
+        "@typespec/compiler": "0.60.0",
+        "@typespec/http": "0.60.0",
+        "@typespec/json-schema": "0.60.0",
+        "@typespec/library-linter": "0.60.0",
+        "@typespec/openapi": "0.60.0",
+        "@typespec/rest": "0.60.0",
+        "@typespec/versioning": "0.60.0",
+        "@typespec/xml": "0.60.0",
         "@vitest/coverage-v8": "^1.4.0",
         "@vitest/ui": "^1.4.0",
         "c8": "^9.1.0",
@@ -24,6 +37,15 @@
         "typescript": "~5.6.3",
         "typescript-eslint": "^7.8.0",
         "vitest": "^1.4.0"
+      },
+      "peerDependencies": {
+        "@azure-tools/typespec-azure-core": ">=0.46.0 <1.0.0 || ~0.47.0-0",
+        "@azure-tools/typespec-client-generator-core": ">=0.46.0 <1.0.0 || ~0.47.0-0",
+        "@typespec/compiler": ">=0.60.0 <1.0.0 || ~0.61.0-0",
+        "@typespec/http": ">=0.60.0 <1.0.0 || ~0.61.0-0",
+        "@typespec/openapi": ">=0.60.0 <1.0.0 || ~0.61.0-0",
+        "@typespec/rest": ">=0.60.0 <1.0.0 || ~0.61.0-0",
+        "@typespec/versioning": ">=0.60.0 <1.0.0 || ~0.61.0-0"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -40,27 +62,83 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/@azure-tools/typespec-autorest": {
+      "version": "0.46.0",
+      "resolved": "https://registry.npmjs.org/@azure-tools/typespec-autorest/-/typespec-autorest-0.46.0.tgz",
+      "integrity": "sha512-LCIvxQgjczWUq/wi6fzKBqYHWJYD0hRLA8wBPzFasriHdBDHjpZ6vgTPmApzt0H5ArZX92Ar53Q5+ZXD9ktMUg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "@azure-tools/typespec-azure-core": "~0.46.0",
+        "@azure-tools/typespec-azure-resource-manager": "~0.46.0",
+        "@azure-tools/typespec-client-generator-core": "~0.46.0",
+        "@typespec/compiler": "~0.60.0",
+        "@typespec/http": "~0.60.0",
+        "@typespec/openapi": "~0.60.0",
+        "@typespec/rest": "~0.60.0",
+        "@typespec/versioning": "~0.60.0"
+      }
+    },
     "node_modules/@azure-tools/typespec-azure-core": {
-      "version": "0.47.0",
-      "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-core/-/typespec-azure-core-0.47.0.tgz",
-      "integrity": "sha512-RcBC5+dE1BVXTrUkkKULTImGxzM/ea3P3IL2kr9pk7r1uqF7D4CGqEKHFTg5L6QUtqc1f+zgTgQTNn6t4gI92w==",
+      "version": "0.46.0",
+      "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-core/-/typespec-azure-core-0.46.0.tgz",
+      "integrity": "sha512-BNE31enSHWtWlrdIKShBS6CNFGk3OYmHSBnWqobcFJkTGXC090EoV2u6otn4BMI99fZRSR4gpwp/kYU9KLE9Jw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "@typespec/compiler": "~0.60.0",
+        "@typespec/http": "~0.60.0",
+        "@typespec/rest": "~0.60.0"
+      }
+    },
+    "node_modules/@azure-tools/typespec-azure-resource-manager": {
+      "version": "0.46.1",
+      "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-resource-manager/-/typespec-azure-resource-manager-0.46.1.tgz",
+      "integrity": "sha512-8md8AwnxoYVkDBavQL5dbToUTS10PTSkcF+emd9BKEdnF9MKuA542vZudzaQOz2BzFbArMVUE/PLm2mhuwRkLw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "change-case": "~5.4.4",
+        "pluralize": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "@azure-tools/typespec-azure-core": "~0.46.0",
+        "@typespec/compiler": "~0.60.0",
+        "@typespec/http": "~0.60.0",
+        "@typespec/openapi": "~0.60.0",
+        "@typespec/rest": "~0.60.0",
+        "@typespec/versioning": "~0.60.0"
+      }
+    },
+    "node_modules/@azure-tools/typespec-azure-rulesets": {
+      "version": "0.46.0",
+      "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-rulesets/-/typespec-azure-rulesets-0.46.0.tgz",
+      "integrity": "sha512-HssO+0ARHbnuLhRiT/7l5DF2hV91Jf/MmsSPdOsDMbVZG26YsB8JD1MiBqs9VJZjB+1xn2DiimYrgqF4n9aDvw==",
+      "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@typespec/compiler": "~0.61.0",
-        "@typespec/http": "~0.61.0",
-        "@typespec/rest": "~0.61.0"
+        "@azure-tools/typespec-azure-core": "~0.46.0",
+        "@azure-tools/typespec-azure-resource-manager": "~0.46.0",
+        "@azure-tools/typespec-client-generator-core": "~0.46.0",
+        "@typespec/compiler": "~0.60.0"
       }
     },
     "node_modules/@azure-tools/typespec-client-generator-core": {
-      "version": "0.47.1",
-      "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.47.1.tgz",
-      "integrity": "sha512-kgjGnnOaHewa8PjmZcEY4+UrEMBrXhOpMxDuhlMnFfOvCo3uZc3FVryoNrDHkZ8weCn6sjxo8zHcj1lpCg4/uw==",
+      "version": "0.46.2",
+      "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.46.2.tgz",
+      "integrity": "sha512-/HKeehCNDeylouOHMe7IwpcDcGJHRAuEy3a5FBnSY51m4EpMq4VMQzW9tka/8brFO2m5LLj7tyhOL/xnzi2fLg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "change-case": "~5.4.4",
         "pluralize": "^8.0.0"
@@ -69,12 +147,12 @@
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@azure-tools/typespec-azure-core": "~0.47.0",
-        "@typespec/compiler": "~0.61.0",
-        "@typespec/http": "~0.61.0",
-        "@typespec/openapi": "~0.61.0",
-        "@typespec/rest": "~0.61.0",
-        "@typespec/versioning": "~0.61.0"
+        "@azure-tools/typespec-azure-core": "~0.46.0",
+        "@typespec/compiler": "~0.60.0",
+        "@typespec/http": "~0.60.0",
+        "@typespec/openapi": "~0.60.0",
+        "@typespec/rest": "~0.60.0",
+        "@typespec/versioning": "~0.60.0"
       }
     },
     "node_modules/@babel/code-frame": {
@@ -82,7 +160,6 @@
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
       "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/highlight": "^7.24.7",
         "picocolors": "^1.0.0"
@@ -115,7 +192,6 @@
       "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz",
       "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.25.7",
         "chalk": "^2.4.2",
@@ -1145,7 +1221,6 @@
       "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz",
       "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -1435,25 +1510,24 @@
       }
     },
     "node_modules/@typespec/compiler": {
-      "version": "0.61.2",
-      "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-0.61.2.tgz",
-      "integrity": "sha512-6QxYJd09VWssd/BvY+8eBxTVv085s1UNK63FdPrgT2lgI+j8VMMcpNR9m5l1zWlgGDM7sniA/Or8VCdVA6jerg==",
+      "version": "0.60.0",
+      "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-0.60.0.tgz",
+      "integrity": "sha512-qAS99tJv6RvxSescfxRVal4QWSfdf3BzIOgE8+Az6emL68aTE/W8zQ0Ijpgmhax7sC2AnLTxCK1tM9kj1YguRw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "~7.24.7",
         "ajv": "~8.17.1",
         "change-case": "~5.4.4",
         "globby": "~14.0.2",
         "mustache": "~4.2.0",
-        "picocolors": "~1.1.0",
+        "picocolors": "~1.0.1",
         "prettier": "~3.3.3",
         "prompts": "~2.4.2",
         "semver": "^7.6.3",
         "temporal-polyfill": "^0.2.5",
         "vscode-languageserver": "~9.0.1",
-        "vscode-languageserver-textdocument": "~1.0.12",
-        "yaml": "~2.5.1",
+        "vscode-languageserver-textdocument": "~1.0.11",
+        "yaml": "~2.4.5",
         "yargs": "~17.7.2"
       },
       "bin": {
@@ -1464,12 +1538,17 @@
         "node": ">=18.0.0"
       }
     },
+    "node_modules/@typespec/compiler/node_modules/picocolors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+      "license": "ISC"
+    },
     "node_modules/@typespec/compiler/node_modules/prettier": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
       "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
       "license": "MIT",
-      "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -1481,22 +1560,15 @@
       }
     },
     "node_modules/@typespec/http": {
-      "version": "0.61.0",
-      "resolved": "https://registry.npmjs.org/@typespec/http/-/http-0.61.0.tgz",
-      "integrity": "sha512-7+AYHkzkc+p652GY9BcEbXY4OZa1fTr03MVmZeafvmbQbXfyzUU9eJld13M3v6NaUWqXWZ7nBNMISyKiXp/kSw==",
+      "version": "0.60.0",
+      "resolved": "https://registry.npmjs.org/@typespec/http/-/http-0.60.0.tgz",
+      "integrity": "sha512-ktfS9vpHfltyeAaQLNAZdqrn6Per3vmB/HDH/iyudYLA5wWblT1siKvpFCMWq53CJorRO7yeOKv+Q/M26zwEtg==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@typespec/compiler": "~0.61.0",
-        "@typespec/streams": "~0.61.0"
-      },
-      "peerDependenciesMeta": {
-        "@typespec/streams": {
-          "optional": true
-        }
+        "@typespec/compiler": "~0.60.0"
       }
     },
     "node_modules/@typespec/http-client-csharp": {
@@ -1517,45 +1589,84 @@
         "@typespec/versioning": ">=0.60.0 <1.0.0 || ~0.61.0-0"
       }
     },
+    "node_modules/@typespec/json-schema": {
+      "version": "0.60.0",
+      "resolved": "https://registry.npmjs.org/@typespec/json-schema/-/json-schema-0.60.0.tgz",
+      "integrity": "sha512-TXtQH82CVtrDjiHjTCE/hHeizC/4DmvTFMmB/64cgC8QIp+C32tmyAv4/iXT6l8ovwB32btL9pAfczKiIxUIZw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "yaml": "~2.4.5"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "@typespec/compiler": "~0.60.0"
+      }
+    },
+    "node_modules/@typespec/library-linter": {
+      "version": "0.60.0",
+      "resolved": "https://registry.npmjs.org/@typespec/library-linter/-/library-linter-0.60.0.tgz",
+      "integrity": "sha512-PGcC+x7T/uq4KvbSm2uv/Eq7jZ6p1N0XynOjJZYx/+GjtB4M7mjAsmcQpuU7yKHfLJz3lfNmtXoAUgKKpC4FDw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "@typespec/compiler": "~0.60.0"
+      }
+    },
     "node_modules/@typespec/openapi": {
-      "version": "0.61.0",
-      "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-0.61.0.tgz",
-      "integrity": "sha512-3AF319Ae4yGVOscsCLQeedXUJJcL/NdGOR2/e/nFiL/AOVdgLfIRnpR0Ad9Zj9XAESh1fq9XSu4Mi7N1k4V7rw==",
+      "version": "0.60.0",
+      "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-0.60.0.tgz",
+      "integrity": "sha512-YVwLppgHY8r/MudHNSLSUXzdw+CIpjmb31gI2a0KDGnI6sWDwY7LSWfjGU4TY/ubt0+X0Tjoy330mTvw71YBTg==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@typespec/compiler": "~0.61.0",
-        "@typespec/http": "~0.61.0"
+        "@typespec/compiler": "~0.60.0",
+        "@typespec/http": "~0.60.0"
       }
     },
     "node_modules/@typespec/rest": {
-      "version": "0.61.0",
-      "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.61.0.tgz",
-      "integrity": "sha512-L9Oyor+l42p6S8GE+UvaZTi+dcu6WubGZKmaBRpX8mCZGsa69EgIK8DQoyxrfMcxAO4I5U0sfkzCKwCVFtRr9g==",
+      "version": "0.60.0",
+      "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.60.0.tgz",
+      "integrity": "sha512-mHYubyuBvwdV2xkHrJfPwV7b/Ksyb9lA1Q/AQwpVFa7Qu1X075TBVALmH+hK3V0EdUG1CGJZ5Sw4BWgl8ZS0BA==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@typespec/compiler": "~0.61.0",
-        "@typespec/http": "~0.61.0"
+        "@typespec/compiler": "~0.60.0",
+        "@typespec/http": "~0.60.0"
       }
     },
     "node_modules/@typespec/versioning": {
-      "version": "0.61.0",
-      "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.61.0.tgz",
-      "integrity": "sha512-PIIug6eg3zc7E+BBHyNHHQD+OBq3FU465nhKrLEp35iVji/sYFuPc1ywnELDuwJVRWm6nvqNL1vtnc+4lEk+oA==",
+      "version": "0.60.0",
+      "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.60.0.tgz",
+      "integrity": "sha512-SqxCQ9qMw5fdR7WP6/GFLzwcFwxhv+uHlzJGVcTd1GtIAu5qj2X4VmzFuNQyu+QenI+5uOSrEEywEXn0YRTZSg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "@typespec/compiler": "~0.60.0"
+      }
+    },
+    "node_modules/@typespec/xml": {
+      "version": "0.60.0",
+      "resolved": "https://registry.npmjs.org/@typespec/xml/-/xml-0.60.0.tgz",
+      "integrity": "sha512-Cr1Vih4ovB1OKHJNrXf23Bq4IiVNGlf7F6kN5Yfc7UDqxy+hiCfuwXfjlu3ida/bYTalGPd4/KL9EAx+m41Bxw==",
+      "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "@typespec/compiler": "~0.61.0"
+        "@typespec/compiler": "~0.60.0"
       }
     },
     "node_modules/@ungap/structured-clone": {
@@ -1759,7 +1870,6 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -1785,7 +1895,6 @@
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "color-convert": "^1.9.0"
       },
@@ -1920,7 +2029,6 @@
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -1934,8 +2042,7 @@
       "version": "5.4.4",
       "resolved": "https://registry.npmjs.org/change-case/-/change-case-5.4.4.tgz",
       "integrity": "sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/check-error": {
       "version": "1.0.3",
@@ -1969,7 +2076,6 @@
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "color-name": "1.1.3"
       }
@@ -1978,8 +2084,7 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
@@ -2235,7 +2340,6 @@
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.8.0"
       }
@@ -2600,8 +2704,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.2.tgz",
       "integrity": "sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/fastq": {
       "version": "1.17.1",
@@ -2827,7 +2930,6 @@
       "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz",
       "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@sindresorhus/merge-streams": "^2.1.0",
         "fast-glob": "^3.3.2",
@@ -2855,7 +2957,6 @@
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=4"
       }
@@ -3105,8 +3206,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
@@ -3132,8 +3232,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/json-serialize-refs": {
       "version": "0.1.0-0",
@@ -3163,7 +3262,6 @@
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -3390,7 +3488,6 @@
       "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
       "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
       "license": "MIT",
-      "peer": true,
       "bin": {
         "mustache": "bin/mustache"
       }
@@ -3609,7 +3706,6 @@
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz",
       "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -3669,7 +3765,6 @@
       "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
       "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=4"
       }
@@ -3769,7 +3864,6 @@
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
       "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "kleur": "^3.0.3",
         "sisteransi": "^1.0.5"
@@ -3842,7 +3936,6 @@
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4070,15 +4163,13 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
       "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/slash": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
       "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=14.16"
       },
@@ -4224,7 +4315,6 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -4237,7 +4327,6 @@
       "resolved": "https://registry.npmjs.org/temporal-polyfill/-/temporal-polyfill-0.2.5.tgz",
       "integrity": "sha512-ye47xp8Cb0nDguAhrrDS1JT1SzwEV9e26sSsrWzVu+yPZ7LzceEcH0i2gci9jWfOfSCCgM3Qv5nOYShVUUFUXA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "temporal-spec": "^0.2.4"
       }
@@ -4246,8 +4335,7 @@
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/temporal-spec/-/temporal-spec-0.2.4.tgz",
       "integrity": "sha512-lDMFv4nKQrSjlkHKAlHVqKrBG4DyFfa9F74cmBZ3Iy3ed8yvWnlWSIdi4IKfSqwmazAohBNwiN64qGx4y5Q3IQ==",
-      "license": "ISC",
-      "peer": true
+      "license": "ISC"
     },
     "node_modules/test-exclude": {
       "version": "6.0.0",
@@ -4483,7 +4571,6 @@
       "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
       "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=18"
       },
@@ -4687,7 +4774,6 @@
       "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz",
       "integrity": "sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=14.0.0"
       }
@@ -4697,7 +4783,6 @@
       "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz",
       "integrity": "sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "vscode-languageserver-protocol": "3.17.5"
       },
@@ -4710,7 +4795,6 @@
       "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz",
       "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "vscode-jsonrpc": "8.2.0",
         "vscode-languageserver-types": "3.17.5"
@@ -4720,15 +4804,13 @@
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz",
       "integrity": "sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/vscode-languageserver-types": {
       "version": "3.17.5",
       "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz",
       "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/which": {
       "version": "2.0.2",
@@ -4905,11 +4987,10 @@
       }
     },
     "node_modules/yaml": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz",
-      "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==",
+      "version": "2.4.5",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.5.tgz",
+      "integrity": "sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==",
       "license": "ISC",
-      "peer": true,
       "bin": {
         "yaml": "bin.mjs"
       },
diff --git a/eng/packages/http-client-csharp/package.json b/eng/packages/http-client-csharp/package.json
index 31b5d4b9ed576..dec174ffa6a0c 100644
--- a/eng/packages/http-client-csharp/package.json
+++ b/eng/packages/http-client-csharp/package.json
@@ -25,10 +25,32 @@
   "dependencies": {
     "@typespec/http-client-csharp": "0.1.9-alpha.20241010.1"
   },
+  "peerDependencies": {
+    "@azure-tools/typespec-azure-core": ">=0.46.0 <1.0.0 || ~0.47.0-0",
+    "@azure-tools/typespec-client-generator-core": ">=0.46.0 <1.0.0 || ~0.47.0-0",
+    "@typespec/compiler": ">=0.60.0 <1.0.0 || ~0.61.0-0",
+    "@typespec/http": ">=0.60.0 <1.0.0 || ~0.61.0-0",
+    "@typespec/openapi": ">=0.60.0 <1.0.0 || ~0.61.0-0",
+    "@typespec/rest": ">=0.60.0 <1.0.0 || ~0.61.0-0",
+    "@typespec/versioning": ">=0.60.0 <1.0.0 || ~0.61.0-0"
+  },
   "devDependencies": {
+    "@azure-tools/typespec-azure-core": "0.46.0",
+    "@azure-tools/typespec-client-generator-core": "0.46.2",
+    "@azure-tools/typespec-azure-resource-manager": "0.46.1",
+    "@azure-tools/typespec-azure-rulesets": "0.46.0",
+    "@azure-tools/typespec-autorest": "0.46.0",
     "@eslint/js": "^9.2.0",
     "@types/node": "~22.7.5",
     "@types/prettier": "^2.6.3",
+    "@typespec/compiler": "0.60.0",
+    "@typespec/http": "0.60.0",
+    "@typespec/json-schema": "0.60.0",
+    "@typespec/library-linter": "0.60.0",
+    "@typespec/openapi": "0.60.0",
+    "@typespec/rest": "0.60.0",
+    "@typespec/versioning": "0.60.0",
+    "@typespec/xml": "0.60.0",
     "@vitest/coverage-v8": "^1.4.0",
     "@vitest/ui": "^1.4.0",
     "c8": "^9.1.0",