Merge remote-tracking branch 'origin/main' into feature/ai-foundry/agents-v2

Author: trrwilson

eng/Packages.Data.props

@@ -495,6 +495,6 @@
   <PropertyGroup>
     <TestProxyVersion>1.0.0-dev.20250930.1</TestProxyVersion>
     <UnbrandedGeneratorVersion>1.0.0-alpha.20251113.2</UnbrandedGeneratorVersion>
-    <AzureGeneratorVersion>1.0.0-alpha.20251022.3</AzureGeneratorVersion>
+    <AzureGeneratorVersion>1.0.0-alpha.20251113.1</AzureGeneratorVersion>
   </PropertyGroup>
 </Project>

eng/azure-typespec-http-client-csharp-mgmt-emitter-package-lock.json

@@ -1,7 +1,7 @@
 {
   "main": "dist/src/index.js",
   "dependencies": {
-    "@azure-typespec/http-client-csharp-mgmt": "1.0.0-alpha.20251111.1"
+    "@azure-typespec/http-client-csharp-mgmt": "1.0.0-alpha.20251112.1"
   },
   "devDependencies": {
     "@azure-tools/typespec-autorest": "0.61.0",

eng/azure-typespec-http-client-csharp-mgmt-emitter-package.json

@@ -3,6 +3,7 @@
 
 using Microsoft.TypeSpec.Generator.Input;
 using System;
+using System.Collections.Generic;
 
 namespace Azure.Generator.Management.InputTransformation
 {
@@ -14,11 +15,27 @@ internal static class InputClientTransformer
             {
                 var operation = method.Operation;
                 SetSubscriptionIdToMethodParameter(operation);
+                RemoveSubscriptionIdFromClient(client);
             }
 
             return client;
         }
 
+        // Remove subscriptionId from client parameter, this is needed due to MTG.
+        // Otherwise, subscriptionId will be added to client constructor
+        private static void RemoveSubscriptionIdFromClient(InputClient client)
+        {
+            var updatedParameters = new List<InputParameter>();
+            foreach (var parameter in client.Parameters)
+            {
+                if (!parameter.SerializedName.Equals("subscriptionId", StringComparison.OrdinalIgnoreCase))
+                {
+                    updatedParameters.Add(parameter);
+                }
+            }
+            client.Update(parameters: updatedParameters);
+        }
+
         private static void SetSubscriptionIdToMethodParameter(InputOperation operation)
         {
             foreach (var parameter in operation.Parameters)