Bump TypeSpec to 1.6.0 (#53971)

Author: live1206

eng/Packages.Data.props

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

eng/packages/http-client-csharp-mgmt/emitter/src/resource-detection.ts

@@ -35,6 +35,7 @@ import {
   armResourceListName,
   armResourceReadName,
   armResourceUpdateName,
+  extensionResourceOperationName,
   nonResourceMethodMetadata,
   parentResourceName,
   resourceGroupResource,
@@ -155,9 +156,9 @@ export async function updateClients(
   for (const [modelId, metadata] of resourceModelToMetadataMap) {
     // TODO: handle the case where there is no parentResourceId but resourceIdPattern is missing
     if (metadata.resourceIdPattern === "" && metadata.parentResourceModelId) {
-      resourceModelToMetadataMap.get(metadata.parentResourceModelId)?.methods.push(
-        ...metadata.methods
-      );
+      resourceModelToMetadataMap
+        .get(metadata.parentResourceModelId)
+        ?.methods.push(...metadata.methods);
       resourceModelToMetadataMap.delete(modelId);
     }
   }
@@ -193,36 +194,95 @@ function parseResourceOperation(
 ): [ResourceOperationKind, string | undefined] | undefined {
   const decorators = serviceMethod?.__raw?.decorators;
   for (const decorator of decorators ?? []) {
-    if (decorator.definition?.name === armResourceReadName) {
-      return [
-        ResourceOperationKind.Get,
-        getResourceModelId(sdkContext, decorator)
-      ];
-    } else if (decorator.definition?.name == armResourceCreateOrUpdateName) {
-      return [
-        ResourceOperationKind.Create,
-        getResourceModelId(sdkContext, decorator)
-      ];
-    } else if (decorator.definition?.name == armResourceUpdateName) {
-      return [
-        ResourceOperationKind.Update,
-        getResourceModelId(sdkContext, decorator)
-      ];
-    } else if (decorator.definition?.name == armResourceDeleteName) {
-      return [
-        ResourceOperationKind.Delete,
-        getResourceModelId(sdkContext, decorator)
-      ];
-    } else if (decorator.definition?.name == armResourceListName) {
-      return [
-        ResourceOperationKind.List,
-        getResourceModelId(sdkContext, decorator)
-      ];
-    } else if (decorator.definition?.name == armResourceActionName) {
-      return [
-        ResourceOperationKind.Action,
-        getResourceModelId(sdkContext, decorator)
-      ];
+    switch (decorator.definition?.name) {
+      case armResourceReadName:
+        return [
+          ResourceOperationKind.Get,
+          getResourceModelId(sdkContext, decorator)
+        ];
+      case armResourceCreateOrUpdateName:
+        return [
+          ResourceOperationKind.Create,
+          getResourceModelId(sdkContext, decorator)
+        ];
+      case armResourceUpdateName:
+        return [
+          ResourceOperationKind.Update,
+          getResourceModelId(sdkContext, decorator)
+        ];
+      case armResourceDeleteName:
+        return [
+          ResourceOperationKind.Delete,
+          getResourceModelId(sdkContext, decorator)
+        ];
+      case armResourceListName:
+        return [
+          ResourceOperationKind.List,
+          getResourceModelId(sdkContext, decorator)
+        ];
+      case armResourceActionName:
+        return [
+          ResourceOperationKind.Action,
+          getResourceModelId(sdkContext, decorator)
+        ];
+      case extensionResourceOperationName:
+        switch (decorator.args[2].jsValue) {
+          case "read":
+            return [
+              ResourceOperationKind.Get,
+              getResourceModelIdCore(
+                sdkContext,
+                decorator.args[1].value as Model,
+                decorator.definition?.name
+              )
+            ];
+          case "createOrUpdate":
+            return [
+              ResourceOperationKind.Create,
+              getResourceModelIdCore(
+                sdkContext,
+                decorator.args[1].value as Model,
+                decorator.definition?.name
+              )
+            ];
+          case "update":
+            return [
+              ResourceOperationKind.Update,
+              getResourceModelIdCore(
+                sdkContext,
+                decorator.args[1].value as Model,
+                decorator.definition?.name
+              )
+            ];
+          case "delete":
+            return [
+              ResourceOperationKind.Delete,
+              getResourceModelIdCore(
+                sdkContext,
+                decorator.args[1].value as Model,
+                decorator.definition?.name
+              )
+            ];
+          case "list":
+            return [
+              ResourceOperationKind.List,
+              getResourceModelIdCore(
+                sdkContext,
+                decorator.args[1].value as Model,
+                decorator.definition?.name
+              )
+            ];
+          case "action":
+            return [
+              ResourceOperationKind.Action,
+              getResourceModelIdCore(
+                sdkContext,
+                decorator.args[1].value as Model,
+                decorator.definition?.name
+              )
+            ];
+        }
+        return undefined;
     }
   }
   return undefined;
@@ -244,18 +304,27 @@ function getResourceModelId(
   decorator?: DecoratorApplication
 ): string | undefined {
   if (!decorator) return undefined;
-  const model = getClientType(
+  return getResourceModelIdCore(
     sdkContext,
-    decorator.args[0].value as Model
-  ) as SdkModelType;
+    decorator.args[0].value as Model,
+    decorator.definition?.name
+  );
+}
+
+function getResourceModelIdCore(
+  sdkContext: CSharpEmitterContext,
+  decoratorModel: Model,
+  decoratorName?: string
+): string | undefined {
+  const model = getClientType(sdkContext, decoratorModel) as SdkModelType;
   if (model) {
     return model.crossLanguageDefinitionId;
   } else {
     sdkContext.logger.reportDiagnostic({
       code: "general-error",
       messageId: "default",
       format: {
-        message: `Resource model not found for decorator ${decorator.decorator.name}`
+        message: `Resource model not found for decorator ${decoratorName}`
       },
       target: NoTarget
     });
@@ -369,7 +438,11 @@ function getOperationScope(path: string): ResourceScope {
     return ResourceScope.ResourceGroup;
   } else if (path.startsWith("/subscriptions/{subscriptionId}/")) {
     return ResourceScope.Subscription;
-  } else if (path.startsWith("/providers/Microsoft.Management/managementGroups/{managementGroupId}/")) {
+  } else if (
+    path.startsWith(
+      "/providers/Microsoft.Management/managementGroups/{managementGroupId}/"
+    )
+  ) {
     return ResourceScope.ManagementGroup;
   }
   return ResourceScope.Tenant; // all the templates work as if there is a tenant decorator when there is no such decorator

eng/packages/http-client-csharp-mgmt/emitter/src/resource-metadata.ts

@@ -5,7 +5,8 @@ const ResourceGroupScopePrefix =
   "/subscriptions/{subscriptionId}/resourceGroups";
 const SubscriptionScopePrefix = "/subscriptions";
 const TenantScopePrefix = "/tenants";
-const ManagementGroupScopePrefix = "/providers/Microsoft.Management/managementGroups";
+const ManagementGroupScopePrefix =
+  "/providers/Microsoft.Management/managementGroups";
 const Providers = "/providers";
 
 export function calculateResourceTypeFromPath(path: string): string {
@@ -46,7 +47,7 @@ export interface ResourceMetadata {
   methods: ResourceMethod[];
   resourceScope: ResourceScope;
   parentResourceId?: string;
-  parentResourceModelId? : string;
+  parentResourceModelId?: string;
   singletonResourceName?: string;
   resourceName: string;
 }

eng/packages/http-client-csharp-mgmt/emitter/src/sdk-context-options.ts

@@ -54,6 +54,8 @@ export const armResourceUpdate = "Azure.ResourceManager.@armResourceUpdate";
 export const armResourceUpdateName = "@armResourceUpdate";
 const armResourceUpdateRegex = "Azure\\.ResourceManager\\.@armResourceUpdate";
 
+export const extensionResourceOperationName = "@extensionResourceOperation";
+
 export const armResourceInternal =
   "Azure.ResourceManager.Private.@armResourceInternal";
 export const armResourceInternalName = "@armResourceInternal";

eng/packages/http-client-csharp-mgmt/emitter/test/resource-detection.test.ts

@@ -1097,32 +1097,45 @@ interface Employees {
     const sdkContext = await createCSharpSdkContext(context);
     const root = createModel(sdkContext);
     updateClients(root, sdkContext);
-    
-    const employeeClient = getAllClients(root).find((c) => c.name === "Employees");
+
+    const employeeClient = getAllClients(root).find(
+      (c) => c.name === "Employees"
+    );
     ok(employeeClient);
-    const employeeParentClient = getAllClients(root).find((c) => c.name === "EmployeeParents");
+    const employeeParentClient = getAllClients(root).find(
+      (c) => c.name === "EmployeeParents"
+    );
     ok(employeeParentClient);
-    
+
     const employeeModel = root.models.find((m) => m.name === "Employee");
     ok(employeeModel);
-    const employeeParentModel = root.models.find((m) => m.name === "EmployeeParent");
+    const employeeParentModel = root.models.find(
+      (m) => m.name === "EmployeeParent"
+    );
     ok(employeeParentModel);
-    
-    const listByParentMethod = employeeClient.methods.find((m) => m.name === "listByParent");
+
+    const listByParentMethod = employeeClient.methods.find(
+      (m) => m.name === "listByParent"
+    );
     ok(listByParentMethod);
-    const getMethod = employeeParentClient.methods.find((m) => m.name === "get");
+    const getMethod = employeeParentClient.methods.find(
+      (m) => m.name === "get"
+    );
     ok(getMethod);
 
     // Validate Employee resource metadata should be null (no CRUD operations)
     const employeeResourceMetadataDecorator = employeeModel.decorators?.find(
       (d) => d.name === resourceMetadata
     );
-    strictEqual(employeeResourceMetadataDecorator, undefined, "Employee should not have resource metadata decorator without CRUD operations");
+    strictEqual(
+      employeeResourceMetadataDecorator,
+      undefined,
+      "Employee should not have resource metadata decorator without CRUD operations"
+    );
 
     // Validate EmployeeParent resource metadata
-    const parentResourceMetadataDecorator = employeeParentModel.decorators?.find(
-      (d) => d.name === resourceMetadata
-    );
+    const parentResourceMetadataDecorator =
+      employeeParentModel.decorators?.find((d) => d.name === resourceMetadata);
     ok(parentResourceMetadataDecorator);
     ok(parentResourceMetadataDecorator.arguments);
     strictEqual(
@@ -1137,14 +1150,21 @@ interface Employees {
       parentResourceMetadataDecorator.arguments.resourceScope,
       "ResourceGroup"
     );
-    strictEqual(parentResourceMetadataDecorator.arguments.parentResourceId, undefined);
-    strictEqual(parentResourceMetadataDecorator.arguments.resourceName, "EmployeeParent");
+    strictEqual(
+      parentResourceMetadataDecorator.arguments.parentResourceId,
+      undefined
+    );
+    strictEqual(
+      parentResourceMetadataDecorator.arguments.resourceName,
+      "EmployeeParent"
+    );
     strictEqual(parentResourceMetadataDecorator.arguments.methods.length, 2);
 
     // Validate EmployeeParent listByParent method
-    const listByParentEntry = parentResourceMetadataDecorator.arguments.methods.find(
-      (m: any) => m.methodId === listByParentMethod.crossLanguageDefinitionId
-    );
+    const listByParentEntry =
+      parentResourceMetadataDecorator.arguments.methods.find(
+        (m: any) => m.methodId === listByParentMethod.crossLanguageDefinitionId
+      );
     ok(listByParentEntry);
   });
 
@@ -1181,10 +1201,12 @@ interface Employees {
     const sdkContext = await createCSharpSdkContext(context);
     const root = createModel(sdkContext);
     updateClients(root, sdkContext);
-    
-    const employeeClient = getAllClients(root).find((c) => c.name === "Employees");
+
+    const employeeClient = getAllClients(root).find(
+      (c) => c.name === "Employees"
+    );
     ok(employeeClient);
-    
+
     const employeeModel = root.models.find((m) => m.name === "Employee");
     ok(employeeModel);