diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
index 402c727b039e9..4b17bfec9c115 100644
--- a/eng/Packages.Data.props
+++ b/eng/Packages.Data.props
@@ -226,7 +226,7 @@
     All should have PrivateAssets="All" set so they don't become package dependencies
   -->
   <ItemGroup>
-    <PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20240711.1" PrivateAssets="All" />
+    <PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20240715.1" PrivateAssets="All" />
     <PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20240429.1" PrivateAssets="All" />
     <PackageReference Update="coverlet.collector" Version="3.2.0" PrivateAssets="All" />
     <PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" PrivateAssets="All" />
diff --git a/eng/emitter-package-lock.json b/eng/emitter-package-lock.json
index 1b900f546b036..dd64c67b7fd1c 100644
--- a/eng/emitter-package-lock.json
+++ b/eng/emitter-package-lock.json
@@ -5,7 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
-        "@azure-tools/typespec-csharp": "0.2.0-beta.20240711.1"
+        "@azure-tools/typespec-csharp": "0.2.0-beta.20240715.1"
       },
       "devDependencies": {
         "@azure-tools/typespec-autorest": "0.43.0",
@@ -22,9 +22,9 @@
       }
     },
     "node_modules/@autorest/csharp": {
-      "version": "3.0.0-beta.20240711.1",
-      "resolved": "https://registry.npmjs.org/@autorest/csharp/-/csharp-3.0.0-beta.20240711.1.tgz",
-      "integrity": "sha512-gZNbt8UqtTkTWVvmKIG6PifZRKvsvJbZk74gKvTruxxmnMJru8rct+xUwzfvio8eQmo5Z0xvrUAnSNCF7/0+DA=="
+      "version": "3.0.0-beta.20240715.1",
+      "resolved": "https://registry.npmjs.org/@autorest/csharp/-/csharp-3.0.0-beta.20240715.1.tgz",
+      "integrity": "sha512-3a/C33rCp1z7zxXZ+tTdlApgBDRZfPZjuwEEnWaYsMnhx0CQ7nD1Z7cM+r7QLqbeFrBtLW0Wg11/ElupCLYwZw=="
     },
     "node_modules/@azure-tools/typespec-autorest": {
       "version": "0.43.0",
@@ -116,11 +116,12 @@
       }
     },
     "node_modules/@azure-tools/typespec-csharp": {
-      "version": "0.2.0-beta.20240711.1",
-      "resolved": "https://registry.npmjs.org/@azure-tools/typespec-csharp/-/typespec-csharp-0.2.0-beta.20240711.1.tgz",
-      "integrity": "sha512-Y/gYQR/cPnPYZyORTEIM7Gvh2NrWOpRlwJE5bRDUx3n0rG+bOtmbqfrLaMSav/E/EPwA4bRO6KpK84XzZYQhoA==",
+      "version": "0.2.0-beta.20240715.1",
+      "resolved": "https://registry.npmjs.org/@azure-tools/typespec-csharp/-/typespec-csharp-0.2.0-beta.20240715.1.tgz",
+      "integrity": "sha512-uPfOE4Jq6GbDPrIjBBqMvRxuTrFs7SZG70HoUWhjYw/xhsmT8Kh/JxjYfAJEeC4sdcMXUh93j7/6rqyNXpAFMw==",
       "dependencies": {
-        "@autorest/csharp": "3.0.0-beta.20240711.1",
+        "@autorest/csharp": "3.0.0-beta.20240715.1",
+        "@typespec/http-client-csharp": "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js-test-autorest/npm/registry/@typespec/http-client-csharp/-/http-client-csharp-0.1.9-alpha.20240712.1.tgz",
         "json-serialize-refs": "0.1.0-0"
       },
       "peerDependencies": {
@@ -261,6 +262,23 @@
         "@typespec/compiler": "~0.57.0"
       }
     },
+    "node_modules/@typespec/http-client-csharp": {
+      "version": "0.1.9-alpha.20240712.1",
+      "resolved": "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-js-test-autorest/npm/registry/@typespec/http-client-csharp/-/http-client-csharp-0.1.9-alpha.20240712.1.tgz",
+      "integrity": "sha512-hmlnbLiP4XoNa46QRzQMXfFAf0G5KB32G4Ut0QTlkx7NYhWxKviNPiG0H6RcxM5FeuHqxWorX0kBEAYySHj95w==",
+      "dependencies": {
+        "json-serialize-refs": "0.1.0-0"
+      },
+      "peerDependencies": {
+        "@azure-tools/typespec-azure-core": ">=0.36.0 <1.0.0",
+        "@azure-tools/typespec-client-generator-core": ">=0.36.0 <1.0.0",
+        "@typespec/compiler": ">=0.50.0 <1.0.0",
+        "@typespec/http": ">=0.50.0 <1.0.0",
+        "@typespec/openapi": ">=0.50.0 <1.0.0",
+        "@typespec/rest": ">=0.50.0 <1.0.0",
+        "@typespec/versioning": ">=0.50.0 <1.0.0"
+      }
+    },
     "node_modules/@typespec/openapi": {
       "version": "0.57.0",
       "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-0.57.0.tgz",
diff --git a/eng/emitter-package.json b/eng/emitter-package.json
index cb79576a6d7fe..23c25aa7c1b8a 100644
--- a/eng/emitter-package.json
+++ b/eng/emitter-package.json
@@ -1,7 +1,7 @@
 {
   "main": "dist/src/index.js",
   "dependencies": {
-    "@azure-tools/typespec-csharp": "0.2.0-beta.20240711.1"
+    "@azure-tools/typespec-csharp": "0.2.0-beta.20240715.1"
   },
   "devDependencies": {
     "@azure-tools/typespec-autorest": "0.43.0",
diff --git a/sdk/communication/Azure.Communication.Messages/src/Generated/Configuration.json b/sdk/communication/Azure.Communication.Messages/Configuration.json
similarity index 91%
rename from sdk/communication/Azure.Communication.Messages/src/Generated/Configuration.json
rename to sdk/communication/Azure.Communication.Messages/Configuration.json
index c38716c9bcc5e..d4f46001482b3 100644
--- a/sdk/communication/Azure.Communication.Messages/src/Generated/Configuration.json
+++ b/sdk/communication/Azure.Communication.Messages/Configuration.json
@@ -2,11 +2,11 @@
   "output-folder": ".",
   "namespace": "Azure.Communication.Messages",
   "library-name": "Azure.Communication.Messages",
+  "model-namespace": false,
+  "flavor": "azure",
+  "use-model-reader-writer": true,
   "shared-source-folders": [
     "../../TempTypeSpecFiles/Communication.Messages/node_modules/@autorest/csharp/Generator.Shared",
     "../../TempTypeSpecFiles/Communication.Messages/node_modules/@autorest/csharp/Azure.Core.Shared"
-  ],
-  "model-namespace": false,
-  "flavor": "azure",
-  "use-model-reader-writer": true
+  ]
 }
diff --git a/sdk/communication/Azure.Communication.Messages/src/Generated/tspCodeModel.json b/sdk/communication/Azure.Communication.Messages/tspCodeModel.json
similarity index 100%
rename from sdk/communication/Azure.Communication.Messages/src/Generated/tspCodeModel.json
rename to sdk/communication/Azure.Communication.Messages/tspCodeModel.json