Azure · pshao25 · Aug 28, 2025 · Jul 21, 2025 · Jul 21, 2025 · Jul 21, 2025
diff --git a/specification/dnsresolver/Network.Management/DnsForwardingRuleset.tsp b/specification/dnsresolver/Network.Management/DnsForwardingRuleset.tsp
@@ -24,7 +24,13 @@ model DnsForwardingRuleset
     SegmentName = "dnsForwardingRulesets",
     NamePattern = ""
   >;
-  ...Azure.ResourceManager.EntityTagProperty;
+
+  /**
+   * ETag of the DNS forwarding ruleset.
+   */
+  #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
+  @visibility(Lifecycle.Read)
+  etag?: string;
 }
 
 @armResourceOperations
@@ -126,7 +132,6 @@ interface DnsForwardingRulesets {
 }
 
 @@doc(DnsForwardingRuleset.name, "The name of the DNS forwarding ruleset.");
-@@encodedName(DnsForwardingRuleset.eTag, "application/json", "etag");
 @@doc(DnsForwardingRuleset.properties,
   "Properties of the DNS forwarding ruleset."
 );

diff --git a/specification/dnsresolver/Network.Management/DnsResolver.tsp b/specification/dnsresolver/Network.Management/DnsResolver.tsp
@@ -21,7 +21,13 @@ model DnsResolver
     SegmentName = "dnsResolvers",
     NamePattern = ""
   >;
-  ...Azure.ResourceManager.EntityTagProperty;
+
+  /**
+   * ETag of the DNS resolver..
+   */
+  #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
+  @visibility(Lifecycle.Read)
+  etag?: string;
 }
 
 @armResourceOperations
@@ -123,7 +129,6 @@ interface DnsResolvers {
 }
 
 @@doc(DnsResolver.name, "The name of the DNS resolver.");
-@@encodedName(DnsResolver.eTag, "application/json", "etag");
 @@doc(DnsResolver.properties, "Properties of the DNS resolver.");
 @@doc(DnsResolvers.createOrUpdate::parameters.resource,
   "Parameters supplied to the CreateOrUpdate operation."

diff --git a/specification/dnsresolver/Network.Management/DnsResolverDomainList.tsp b/specification/dnsresolver/Network.Management/DnsResolverDomainList.tsp
@@ -21,7 +21,13 @@ model DnsResolverDomainList
     SegmentName = "dnsResolverDomainLists",
     NamePattern = "^[a-zA-Z0-9]([a-zA-Z0-9_\\-]*[a-zA-Z0-9])?$"
   >;
-  ...Azure.ResourceManager.EntityTagProperty;
+
+  /**
+   * ETag of the DNS resolver domain list.
+   */
+  #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
+  @visibility(Lifecycle.Read)
+  etag?: string;
 }
 
 @armResourceOperations
@@ -136,7 +142,6 @@ interface DnsResolverDomainLists {
 @@maxLength(DnsResolverDomainList.name, 80);
 @@minLength(DnsResolverDomainList.name, 1);
 @@doc(DnsResolverDomainList.name, "The name of the DNS resolver domain list.");
-@@encodedName(DnsResolverDomainList.eTag, "application/json", "etag");
 @@doc(DnsResolverDomainList.properties,
   "Properties of the DNS resolver domain list."
 );

diff --git a/specification/dnsresolver/Network.Management/DnsResolverPolicy.tsp b/specification/dnsresolver/Network.Management/DnsResolverPolicy.tsp
@@ -21,7 +21,13 @@ model DnsResolverPolicy
     SegmentName = "dnsResolverPolicies",
     NamePattern = "^[a-zA-Z0-9]([a-zA-Z0-9_\\-]*[a-zA-Z0-9])?$"
   >;
-  ...Azure.ResourceManager.EntityTagProperty;
+
+  /**
+   * ETag of the DNS resolver policy.
+   */
+  #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
+  @visibility(Lifecycle.Read)
+  etag?: string;
 }
 
 @armResourceOperations
@@ -114,7 +120,6 @@ interface DnsResolverPolicies {
 @@maxLength(DnsResolverPolicy.name, 80);
 @@minLength(DnsResolverPolicy.name, 1);
 @@doc(DnsResolverPolicy.name, "The name of the DNS resolver policy.");
-@@encodedName(DnsResolverPolicy.eTag, "application/json", "etag");
 @@doc(DnsResolverPolicy.properties, "Properties of the DNS resolver policy.");
 @@doc(DnsResolverPolicies.createOrUpdate::parameters.resource,
   "Parameters supplied to the CreateOrUpdate operation."

diff --git a/specification/dnsresolver/Network.Management/DnsResolverPolicyVirtualNetworkLink.tsp b/specification/dnsresolver/Network.Management/DnsResolverPolicyVirtualNetworkLink.tsp
@@ -26,7 +26,13 @@ model DnsResolverPolicyVirtualNetworkLink
     SegmentName = "virtualNetworkLinks",
     NamePattern = "^[a-zA-Z0-9]([a-zA-Z0-9_\\-]*[a-zA-Z0-9])?$"
   >;
-  ...Azure.ResourceManager.EntityTagProperty;
+
+  /**
+   * ETag of the DNS resolver policy virtual network link.
+   */
+  #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
+  @visibility(Lifecycle.Read)
+  etag?: string;
 }
 
 @armResourceOperations
@@ -107,10 +113,6 @@ interface DnsResolverPolicyVirtualNetworkLinks {
 @@doc(DnsResolverPolicyVirtualNetworkLink.name,
   "The name of the DNS resolver policy virtual network link for the DNS resolver policy."
 );
-@@encodedName(DnsResolverPolicyVirtualNetworkLink.eTag,
-  "application/json",
-  "etag"
-);
 @@doc(DnsResolverPolicyVirtualNetworkLink.properties,
   "Properties of the DNS resolver policy virtual network link."
 );

diff --git a/specification/dnsresolver/Network.Management/DnsSecurityRule.tsp b/specification/dnsresolver/Network.Management/DnsSecurityRule.tsp
@@ -23,7 +23,13 @@ model DnsSecurityRule
     SegmentName = "dnsSecurityRules",
     NamePattern = "^[a-zA-Z0-9]([a-zA-Z0-9_\\-]*[a-zA-Z0-9])?$"
   >;
-  ...Azure.ResourceManager.EntityTagProperty;
+
+  /**
+   * ETag of the DNS security rule.
+   */
+  #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
+  @visibility(Lifecycle.Read)
+  etag?: string;
 }
 
 @armResourceOperations
@@ -102,7 +108,6 @@ interface DnsSecurityRules {
 @@maxLength(DnsSecurityRule.name, 80);
 @@minLength(DnsSecurityRule.name, 1);
 @@doc(DnsSecurityRule.name, "The name of the DNS security rule.");
-@@encodedName(DnsSecurityRule.eTag, "application/json", "etag");
 @@doc(DnsSecurityRule.properties, "Properties of the DNS security rule.");
 @@doc(DnsSecurityRules.createOrUpdate::parameters.resource,
   "Parameters supplied to the CreateOrUpdate operation."

diff --git a/specification/dnsresolver/Network.Management/ForwardingRule.tsp b/specification/dnsresolver/Network.Management/ForwardingRule.tsp
@@ -23,7 +23,13 @@ model ForwardingRule
     SegmentName = "forwardingRules",
     NamePattern = ""
   >;
-  ...Azure.ResourceManager.EntityTagProperty;
+
+  /**
+   * ETag of the forwarding rule.
+   */
+  #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
+  @visibility(Lifecycle.Read)
+  etag?: string;
 }
 
 @armResourceOperations
@@ -103,7 +109,6 @@ interface ForwardingRules {
 }
 
 @@doc(ForwardingRule.name, "The name of the forwarding rule.");
-@@encodedName(ForwardingRule.eTag, "application/json", "etag");
 @@doc(ForwardingRule.properties, "Properties of the forwarding rule.");
 @@doc(ForwardingRules.createOrUpdate::parameters.resource,
   "Parameters supplied to the CreateOrUpdate operation."

diff --git a/specification/dnsresolver/Network.Management/InboundEndpoint.tsp b/specification/dnsresolver/Network.Management/InboundEndpoint.tsp
@@ -23,7 +23,13 @@ model InboundEndpoint
     SegmentName = "inboundEndpoints",
     NamePattern = ""
   >;
-  ...Azure.ResourceManager.EntityTagProperty;
+
+  /**
+   * ETag of the inbound endpoint.
+   */
+  #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
+  @visibility(Lifecycle.Read)
+  etag?: string;
 }
 
 @armResourceOperations
@@ -112,7 +118,6 @@ interface InboundEndpoints {
 @@doc(InboundEndpoint.name,
   "The name of the inbound endpoint for the DNS resolver."
 );
-@@encodedName(InboundEndpoint.eTag, "application/json", "etag");
 @@doc(InboundEndpoint.properties, "Properties of the inbound endpoint.");
 @@doc(InboundEndpoints.createOrUpdate::parameters.resource,
   "Parameters supplied to the CreateOrUpdate operation."

diff --git a/specification/dnsresolver/Network.Management/OutboundEndpoint.tsp b/specification/dnsresolver/Network.Management/OutboundEndpoint.tsp
@@ -23,7 +23,13 @@ model OutboundEndpoint
     SegmentName = "outboundEndpoints",
     NamePattern = ""
   >;
-  ...Azure.ResourceManager.EntityTagProperty;
+
+  /**
+   * ETag of the outbound endpoint.
+   */
+  #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
+  @visibility(Lifecycle.Read)
+  etag?: string;
 }
 
 @armResourceOperations
@@ -112,7 +118,6 @@ interface OutboundEndpoints {
 @@doc(OutboundEndpoint.name,
   "The name of the outbound endpoint for the DNS resolver."
 );
-@@encodedName(OutboundEndpoint.eTag, "application/json", "etag");
 @@doc(OutboundEndpoint.properties, "Properties of the outbound endpoint.");
 @@doc(OutboundEndpoints.createOrUpdate::parameters.resource,
   "Parameters supplied to the CreateOrUpdate operation."

diff --git a/specification/dnsresolver/Network.Management/VirtualNetworkLink.tsp b/specification/dnsresolver/Network.Management/VirtualNetworkLink.tsp
@@ -23,7 +23,13 @@ model VirtualNetworkLink
     SegmentName = "virtualNetworkLinks",
     NamePattern = ""
   >;
-  ...Azure.ResourceManager.EntityTagProperty;
+
+  /**
+   * ETag of the virtual network link.
+   */
+  #suppress "@azure-tools/typespec-azure-resource-manager/arm-resource-invalid-envelope-property" "FIXME: Update justification, follow aka.ms/tsp/conversion-fix for details"
+  @visibility(Lifecycle.Read)
+  etag?: string;
 }
 
 @armResourceOperations
@@ -110,7 +116,6 @@ interface VirtualNetworkLinks {
 }
 
 @@doc(VirtualNetworkLink.name, "The name of the virtual network link.");
-@@encodedName(VirtualNetworkLink.eTag, "application/json", "etag");
 @@doc(VirtualNetworkLink.properties, "Properties of the virtual network link.");
 @@doc(VirtualNetworkLinks.createOrUpdate::parameters.resource,
   "Parameters supplied to the CreateOrUpdate operation."

diff --git a/specification/dnsresolver/Network.Management/routes.tsp b/specification/dnsresolver/Network.Management/routes.tsp
@@ -88,5 +88,5 @@ interface DnsResolverPoliciesOperationGroup {
      */
     @path
     virtualNetworkName: string,
-  ): ArmResponse<SubResourceListResult>;
+  ): ArmResponse<SubResourceListResult> | ErrorResponse;
 }
diff --git a/specification/dnsresolver/resource-manager/Microsoft.Network/stable/2025-05-01/openapi.json b/specification/dnsresolver/resource-manager/Microsoft.Network/stable/2025-05-01/openapi.json
@@ -4087,6 +4087,12 @@
             "schema": {
               "$ref": "#/definitions/SubResourceListResult"
             }
+          },
+          "default": {
+            "description": "An unexpected error response.",
+            "schema": {
+              "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse"
+            }
           }
         },
         "x-ms-examples": {
@@ -4250,9 +4256,8 @@
         },
         "etag": {
           "type": "string",
-          "description": "If eTag is provided in the response body, it may also be provided as a header per the normal etag convention.  Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields.",
-          "readOnly": true,
-          "x-ms-client-name": "eTag"
+          "description": "ETag of the DNS forwarding ruleset.",
+          "readOnly": true
         }
       },
       "required": [
@@ -4347,9 +4352,8 @@
         },
         "etag": {
           "type": "string",
-          "description": "If eTag is provided in the response body, it may also be provided as a header per the normal etag convention.  Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields.",
-          "readOnly": true,
-          "x-ms-client-name": "eTag"
+          "description": "ETag of the DNS resolver..",
+          "readOnly": true
         }
       },
       "required": [
@@ -4372,9 +4376,8 @@
         },
         "etag": {
           "type": "string",
-          "description": "If eTag is provided in the response body, it may also be provided as a header per the normal etag convention.  Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields.",
-          "readOnly": true,
-          "x-ms-client-name": "eTag"
+          "description": "ETag of the DNS resolver domain list.",
+          "readOnly": true
         }
       },
       "allOf": [
@@ -4550,9 +4553,8 @@
         },
         "etag": {
           "type": "string",
-          "description": "If eTag is provided in the response body, it may also be provided as a header per the normal etag convention.  Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields.",
-          "readOnly": true,
-          "x-ms-client-name": "eTag"
+          "description": "ETag of the DNS resolver policy.",
+          "readOnly": true
         }
       },
       "allOf": [
@@ -4627,9 +4629,8 @@
         },
         "etag": {
           "type": "string",
-          "description": "If eTag is provided in the response body, it may also be provided as a header per the normal etag convention.  Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields.",
-          "readOnly": true,
-          "x-ms-client-name": "eTag"
+          "description": "ETag of the DNS resolver policy virtual network link.",
+          "readOnly": true
         }
       },
       "required": [
@@ -4767,9 +4768,8 @@
         },
         "etag": {
           "type": "string",
-          "description": "If eTag is provided in the response body, it may also be provided as a header per the normal etag convention.  Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields.",
-          "readOnly": true,
-          "x-ms-client-name": "eTag"
+          "description": "ETag of the DNS security rule.",
+          "readOnly": true
         }
       },
       "required": [
@@ -4942,9 +4942,8 @@
         },
         "etag": {
           "type": "string",
-          "description": "If eTag is provided in the response body, it may also be provided as a header per the normal etag convention.  Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields.",
-          "readOnly": true,
-          "x-ms-client-name": "eTag"
+          "description": "ETag of the forwarding rule.",
+          "readOnly": true
         }
       },
       "required": [
@@ -5103,9 +5102,8 @@
         },
         "etag": {
           "type": "string",
-          "description": "If eTag is provided in the response body, it may also be provided as a header per the normal etag convention.  Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields.",
-          "readOnly": true,
-          "x-ms-client-name": "eTag"
+          "description": "ETag of the inbound endpoint.",
+          "readOnly": true
         }
       },
       "required": [
@@ -5234,9 +5232,8 @@
         },
         "etag": {
           "type": "string",
-          "description": "If eTag is provided in the response body, it may also be provided as a header per the normal etag convention.  Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields.",
-          "readOnly": true,
-          "x-ms-client-name": "eTag"
+          "description": "ETag of the outbound endpoint.",
+          "readOnly": true
         }
       },
       "required": [
@@ -5452,9 +5449,8 @@
         },
         "etag": {
           "type": "string",
-          "description": "If eTag is provided in the response body, it may also be provided as a header per the normal etag convention.  Entity tags are used for comparing two or more entities from the same requested resource. HTTP/1.1 uses entity tags in the etag (section 14.19), If-Match (section 14.24), If-None-Match (section 14.26), and If-Range (section 14.27) header fields.",
-          "readOnly": true,
-          "x-ms-client-name": "eTag"
+          "description": "ETag of the virtual network link.",
+          "readOnly": true
         }
       },
       "required": [