diff --git a/sdk/servicefabricmesh/arm-servicefabricmesh/CHANGELOG.md b/sdk/servicefabricmesh/arm-servicefabricmesh/CHANGELOG.md
index 77d8a92d1ee6..15ee1f2d0ef1 100644
--- a/sdk/servicefabricmesh/arm-servicefabricmesh/CHANGELOG.md
+++ b/sdk/servicefabricmesh/arm-servicefabricmesh/CHANGELOG.md
@@ -1,18 +1,8 @@
 # Release History
+    
+## 3.0.0-beta.4 (2022-08-10)
 
-## 3.0.0-beta.4 (Unreleased)
-
-### Features Added
-
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
-
-## 3.0.0-beta.3 (2022-06-15)
-
-The package of @azure/arm-servicefabricmesh is using our next generation design principles since version 3.0.0-beta.3, which contains breaking changes.
+The package of @azure/arm-servicefabricmesh is using our next generation design principles since version 3.0.0-beta.4, which contains breaking changes.
 
 To understand the detail of the change, please refer to [Changelog](https://aka.ms/js-track2-changelog).
 
diff --git a/sdk/servicefabricmesh/arm-servicefabricmesh/_meta.json b/sdk/servicefabricmesh/arm-servicefabricmesh/_meta.json
index 2d4455589319..857165bc872b 100644
--- a/sdk/servicefabricmesh/arm-servicefabricmesh/_meta.json
+++ b/sdk/servicefabricmesh/arm-servicefabricmesh/_meta.json
@@ -1,8 +1,8 @@
 {
-  "commit": "aa42d66d5b919ea80c8dde04ae19d30a9c974d7d",
+  "commit": "88e73587292ae006bef7f6c4c230eb92a9d938da",
   "readme": "specification/servicefabricmesh/resource-manager/readme.md",
-  "autorest_command": "autorest --version=3.7.3 --typescript --modelerfour.lenient-model-deduplication --head-as-boolean=true --license-header=MICROSOFT_MIT_NO_VERSION --generate-test --typescript-sdks-folder=D:\\Git\\azure-sdk-for-js ..\\azure-rest-api-specs\\specification\\servicefabricmesh\\resource-manager\\readme.md --use=@autorest/typescript@6.0.0-beta.20 --generate-sample=true",
+  "autorest_command": "",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs.git",
-  "release_tool": "@azure-tools/js-sdk-release-tools@2.3.0",
-  "use": "@autorest/typescript@6.0.0-beta.20"
+  "release_tool": "@azure-tools/js-sdk-release-tools@2.4.1",
+  "use": "@autorest/typescript@6.0.0-rc.1"
 }
\ No newline at end of file
diff --git a/sdk/servicefabricmesh/arm-servicefabricmesh/package.json b/sdk/servicefabricmesh/arm-servicefabricmesh/package.json
index 41c73bc8afe8..39de8faaf65a 100644
--- a/sdk/servicefabricmesh/arm-servicefabricmesh/package.json
+++ b/sdk/servicefabricmesh/arm-servicefabricmesh/package.json
@@ -96,8 +96,7 @@
     "unit-test:browser": "echo skipped",
     "integration-test": "npm run integration-test:node && npm run integration-test:browser",
     "integration-test:node": "dev-tool run test:node-ts-input -- --timeout 1200000 'test/*.ts'",
-    "integration-test:browser": "echo skipped",
-    "docs": "echo skipped"
+    "integration-test:browser": "echo skipped"
   },
   "sideEffects": false,
   "//metadata": {
@@ -108,13 +107,5 @@
       }
     ]
   },
-  "autoPublish": true,
-  "//sampleConfiguration": {
-    "productName": "",
-    "productSlugs": [
-      "azure"
-    ],
-    "disableDocsMs": true,
-    "apiRefLink": "https://docs.microsoft.com/javascript/api/@azure/arm-servicefabricmesh?view=azure-node-preview"
-  }
-}
+  "autoPublish": true
+}
\ No newline at end of file
diff --git a/sdk/servicefabricmesh/arm-servicefabricmesh/review/arm-servicefabricmesh.api.md b/sdk/servicefabricmesh/arm-servicefabricmesh/review/arm-servicefabricmesh.api.md
index 0826ce4734c0..c26d0ae20a1e 100644
--- a/sdk/servicefabricmesh/arm-servicefabricmesh/review/arm-servicefabricmesh.api.md
+++ b/sdk/servicefabricmesh/arm-servicefabricmesh/review/arm-servicefabricmesh.api.md
@@ -9,12 +9,12 @@ import * as coreClient from '@azure/core-client';
 import { PagedAsyncIterableIterator } from '@azure/core-paging';
 
 // @public
-export type AddRemoveReplicaScalingMechanism = AutoScalingMechanism & {
+export interface AddRemoveReplicaScalingMechanism extends AutoScalingMechanism {
     kind: "AddRemoveReplica";
-    minCount: number;
     maxCount: number;
+    minCount: number;
     scaleIncrement: number;
-};
+}
 
 // @public
 export interface Application {
@@ -85,18 +85,18 @@ export interface ApplicationProperties {
 }
 
 // @public
-export type ApplicationResourceDescription = TrackedResource & {
-    readonly provisioningState?: string;
+export interface ApplicationResourceDescription extends TrackedResource {
+    debugParams?: string;
     description?: string;
-    services?: ServiceResourceDescription[];
     diagnostics?: DiagnosticsDescription;
-    debugParams?: string;
+    readonly healthState?: HealthState;
+    readonly provisioningState?: string;
     readonly serviceNames?: string[];
+    services?: ServiceResourceDescription[];
     readonly status?: ResourceStatus;
     readonly statusDetails?: string;
-    readonly healthState?: HealthState;
     readonly unhealthyEvaluation?: string;
-};
+}
 
 // @public
 export interface ApplicationResourceDescriptionList {
@@ -105,12 +105,13 @@ export interface ApplicationResourceDescriptionList {
 }
 
 // @public
-export type ApplicationResourceProperties = ProvisionedResourceProperties & ApplicationProperties;
+export interface ApplicationResourceProperties extends ProvisionedResourceProperties, ApplicationProperties {
+}
 
 // @public
-export type ApplicationScopedVolume = VolumeReference & {
+export interface ApplicationScopedVolume extends VolumeReference {
     creationParameters: ApplicationScopedVolumeCreationParametersUnion;
-};
+}
 
 // @public
 export interface ApplicationScopedVolumeCreationParameters {
@@ -119,10 +120,10 @@ export interface ApplicationScopedVolumeCreationParameters {
 }
 
 // @public
-export type ApplicationScopedVolumeCreationParametersServiceFabricVolumeDisk = ApplicationScopedVolumeCreationParameters & {
+export interface ApplicationScopedVolumeCreationParametersServiceFabricVolumeDisk extends ApplicationScopedVolumeCreationParameters {
     kind: "ServiceFabricVolumeDisk";
     sizeDisk: SizeTypes;
-};
+}
 
 // @public (undocumented)
 export type ApplicationScopedVolumeCreationParametersUnion = ApplicationScopedVolumeCreationParameters | ApplicationScopedVolumeCreationParametersServiceFabricVolumeDisk;
@@ -160,10 +161,10 @@ export interface AutoScalingPolicy {
 }
 
 // @public
-export type AutoScalingResourceMetric = AutoScalingMetric & {
+export interface AutoScalingResourceMetric extends AutoScalingMetric {
     kind: "Resource";
     name: AutoScalingResourceMetricName;
-};
+}
 
 // @public
 export type AutoScalingResourceMetricName = string;
@@ -188,23 +189,23 @@ export interface AvailableOperationDisplay {
 }
 
 // @public
-export type AverageLoadScalingTrigger = AutoScalingTrigger & {
+export interface AverageLoadScalingTrigger extends AutoScalingTrigger {
     kind: "AverageLoad";
-    metric: AutoScalingMetricUnion;
     lowerLoadThreshold: number;
-    upperLoadThreshold: number;
+    metric: AutoScalingMetricUnion;
     scaleIntervalInSeconds: number;
-};
+    upperLoadThreshold: number;
+}
 
 // @public
-export type AzureInternalMonitoringPipelineSinkDescription = DiagnosticsSinkProperties & {
-    kind: "AzureInternalMonitoringPipeline";
+export interface AzureInternalMonitoringPipelineSinkDescription extends DiagnosticsSinkProperties {
     accountName?: string;
-    namespace?: string;
-    maConfigUrl?: string;
-    fluentdConfigUrl?: any;
     autoKeyConfigUrl?: string;
-};
+    fluentdConfigUrl?: any;
+    kind: "AzureInternalMonitoringPipeline";
+    maConfigUrl?: string;
+    namespace?: string;
+}
 
 // @public
 export interface CodePackage {
@@ -416,17 +417,17 @@ export interface GatewayProperties {
 }
 
 // @public
-export type GatewayResourceDescription = TrackedResource & {
-    readonly provisioningState?: string;
+export interface GatewayResourceDescription extends TrackedResource {
     description?: string;
-    sourceNetwork: NetworkRef;
     destinationNetwork: NetworkRef;
-    tcp?: TcpConfig[];
     http?: HttpConfig[];
+    readonly ipAddress?: string;
+    readonly provisioningState?: string;
+    sourceNetwork: NetworkRef;
     readonly status?: ResourceStatus;
     readonly statusDetails?: string;
-    readonly ipAddress?: string;
-};
+    tcp?: TcpConfig[];
+}
 
 // @public
 export interface GatewayResourceDescriptionList {
@@ -435,7 +436,8 @@ export interface GatewayResourceDescriptionList {
 }
 
 // @public
-export type GatewayResourceProperties = ProvisionedResourceProperties & GatewayProperties;
+export interface GatewayResourceProperties extends ProvisionedResourceProperties, GatewayProperties {
+}
 
 // @public
 export type HeaderMatchType = string;
@@ -491,7 +493,8 @@ export interface ImageRegistryCredential {
 }
 
 // @public
-export type InlinedValueSecretResourceProperties = SecretResourceProperties;
+export interface InlinedValueSecretResourceProperties extends SecretResourceProperties {
+}
 
 // @public
 export enum KnownApplicationScopedVolumeKind {
@@ -527,7 +530,6 @@ export enum KnownDiagnosticsSinkKind {
 
 // @public
 export enum KnownHeaderMatchType {
-    // (undocumented)
     Exact = "exact"
 }
 
@@ -553,7 +555,6 @@ export enum KnownOperatingSystemType {
 
 // @public
 export enum KnownPathMatchType {
-    // (undocumented)
     Prefix = "prefix"
 }
 
@@ -569,16 +570,13 @@ export enum KnownResourceStatus {
 
 // @public
 export enum KnownSecretKind {
-    InlinedValue = "inlinedValue"
+    InlinedValue = "InlinedValue"
 }
 
 // @public
 export enum KnownSizeTypes {
-    // (undocumented)
     Large = "Large",
-    // (undocumented)
     Medium = "Medium",
-    // (undocumented)
     Small = "Small"
 }
 
@@ -588,9 +586,9 @@ export enum KnownVolumeProvider {
 }
 
 // @public
-export type LocalNetworkResourceProperties = NetworkResourceProperties & {
+export interface LocalNetworkResourceProperties extends NetworkResourceProperties {
     networkAddressPrefix?: string;
-};
+}
 
 // @public
 export interface ManagedProxyResource {
@@ -664,9 +662,9 @@ export interface NetworkRef {
 }
 
 // @public
-export type NetworkResourceDescription = TrackedResource & {
+export interface NetworkResourceDescription extends TrackedResource {
     properties: NetworkResourcePropertiesUnion;
-};
+}
 
 // @public
 export interface NetworkResourceDescriptionList {
@@ -675,16 +673,16 @@ export interface NetworkResourceDescriptionList {
 }
 
 // @public
-export type NetworkResourceProperties = NetworkResourcePropertiesBase & {
+export interface NetworkResourceProperties extends NetworkResourcePropertiesBase {
     description?: string;
     readonly status?: ResourceStatus;
     readonly statusDetails?: string;
-};
+}
 
 // @public
-export type NetworkResourcePropertiesBase = ProvisionedResourceProperties & {
+export interface NetworkResourcePropertiesBase extends ProvisionedResourceProperties {
     kind: NetworkKind;
-};
+}
 
 // @public (undocumented)
 export type NetworkResourcePropertiesBaseUnion = NetworkResourcePropertiesBase | NetworkResourcePropertiesUnion;
@@ -737,7 +735,8 @@ export interface ProvisionedResourceProperties {
 }
 
 // @public
-export type ProxyResource = Resource;
+export interface ProxyResource extends Resource {
+}
 
 // @public
 export interface ReliableCollectionsRef {
@@ -832,9 +831,9 @@ export interface SecretListBySubscriptionOptionalParams extends coreClient.Opera
 export type SecretListBySubscriptionResponse = SecretResourceDescriptionList;
 
 // @public
-export type SecretResourceDescription = TrackedResource & {
+export interface SecretResourceDescription extends TrackedResource {
     properties: SecretResourcePropertiesUnion;
-};
+}
 
 // @public
 export interface SecretResourceDescriptionList {
@@ -843,17 +842,17 @@ export interface SecretResourceDescriptionList {
 }
 
 // @public
-export type SecretResourceProperties = SecretResourcePropertiesBase & {
+export interface SecretResourceProperties extends SecretResourcePropertiesBase {
+    contentType?: string;
     description?: string;
     readonly status?: ResourceStatus;
     readonly statusDetails?: string;
-    contentType?: string;
-};
+}
 
 // @public
-export type SecretResourcePropertiesBase = ProvisionedResourceProperties & {
+export interface SecretResourcePropertiesBase extends ProvisionedResourceProperties {
     kind: SecretKind;
-};
+}
 
 // @public (undocumented)
 export type SecretResourcePropertiesBaseUnion = SecretResourcePropertiesBase | SecretResourcePropertiesUnion;
@@ -920,10 +919,10 @@ export interface SecretValueProperties {
 }
 
 // @public
-export type SecretValueResourceDescription = TrackedResource & {
+export interface SecretValueResourceDescription extends TrackedResource {
     readonly provisioningState?: string;
     value?: string;
-};
+}
 
 // @public
 export interface SecretValueResourceDescriptionList {
@@ -932,7 +931,8 @@ export interface SecretValueResourceDescriptionList {
 }
 
 // @public
-export type SecretValueResourceProperties = ProvisionedResourceProperties & SecretValueProperties;
+export interface SecretValueResourceProperties extends ProvisionedResourceProperties, SecretValueProperties {
+}
 
 // @public
 export interface Service {
@@ -1017,9 +1017,9 @@ export interface ServiceReplica {
 }
 
 // @public
-export type ServiceReplicaDescription = ServiceReplicaProperties & {
+export interface ServiceReplicaDescription extends ServiceReplicaProperties {
     replicaName: string;
-};
+}
 
 // @public
 export interface ServiceReplicaDescriptionList {
@@ -1057,20 +1057,20 @@ export interface ServiceReplicaProperties {
 }
 
 // @public
-export type ServiceResourceDescription = ManagedProxyResource & {
-    readonly provisioningState?: string;
-    osType: OperatingSystemType;
+export interface ServiceResourceDescription extends ManagedProxyResource {
+    autoScalingPolicies?: AutoScalingPolicy[];
     codePackages: ContainerCodePackageProperties[];
-    networkRefs?: NetworkRef[];
-    diagnostics?: DiagnosticsRef;
     description?: string;
+    diagnostics?: DiagnosticsRef;
+    readonly healthState?: HealthState;
+    networkRefs?: NetworkRef[];
+    osType: OperatingSystemType;
+    readonly provisioningState?: string;
     replicaCount?: number;
-    autoScalingPolicies?: AutoScalingPolicy[];
     readonly status?: ResourceStatus;
     readonly statusDetails?: string;
-    readonly healthState?: HealthState;
     readonly unhealthyEvaluation?: string;
-};
+}
 
 // @public
 export interface ServiceResourceDescriptionList {
@@ -1079,7 +1079,8 @@ export interface ServiceResourceDescriptionList {
 }
 
 // @public
-export type ServiceResourceProperties = ProvisionedResourceProperties & ServiceReplicaProperties & ServiceProperties;
+export interface ServiceResourceProperties extends ProvisionedResourceProperties, ServiceReplicaProperties, ServiceProperties {
+}
 
 // @public
 export interface Setting {
@@ -1098,12 +1099,12 @@ export interface TcpConfig {
 }
 
 // @public
-export type TrackedResource = Resource & {
+export interface TrackedResource extends Resource {
+    location: string;
     tags?: {
         [propertyName: string]: string;
     };
-    location: string;
-};
+}
 
 // @public
 export interface Volume {
@@ -1187,14 +1188,14 @@ export interface VolumeReference {
 }
 
 // @public
-export type VolumeResourceDescription = TrackedResource & {
-    readonly provisioningState?: string;
+export interface VolumeResourceDescription extends TrackedResource {
+    azureFileParameters?: VolumeProviderParametersAzureFile;
     description?: string;
+    provider: VolumeProvider;
+    readonly provisioningState?: string;
     readonly status?: ResourceStatus;
     readonly statusDetails?: string;
-    provider: VolumeProvider;
-    azureFileParameters?: VolumeProviderParametersAzureFile;
-};
+}
 
 // @public
 export interface VolumeResourceDescriptionList {
@@ -1203,7 +1204,8 @@ export interface VolumeResourceDescriptionList {
 }
 
 // @public
-export type VolumeResourceProperties = ProvisionedResourceProperties & VolumeProperties;
+export interface VolumeResourceProperties extends ProvisionedResourceProperties, VolumeProperties {
+}
 
 // (No @packageDocumentation comment for this package)
 
diff --git a/sdk/servicefabricmesh/arm-servicefabricmesh/src/models/index.ts b/sdk/servicefabricmesh/arm-servicefabricmesh/src/models/index.ts
index 534ced6026e7..4e79844a341b 100644
--- a/sdk/servicefabricmesh/arm-servicefabricmesh/src/models/index.ts
+++ b/sdk/servicefabricmesh/arm-servicefabricmesh/src/models/index.ts
@@ -676,71 +676,79 @@ export interface AutoScalingMetric {
 }
 
 /** This type describes the properties of a secret resource, including its kind. */
-export type SecretResourcePropertiesBase = ProvisionedResourceProperties & {
+export interface SecretResourcePropertiesBase
+  extends ProvisionedResourceProperties {
   /** Describes the kind of secret. */
   kind: SecretKind;
-};
+}
 
 /** This type describes properties of a secret value resource. */
-export type SecretValueResourceProperties = ProvisionedResourceProperties &
-  SecretValueProperties;
+export interface SecretValueResourceProperties
+  extends ProvisionedResourceProperties,
+    SecretValueProperties {}
 
 /** This type describes properties of a volume resource. */
-export type VolumeResourceProperties = ProvisionedResourceProperties &
-  VolumeProperties;
+export interface VolumeResourceProperties
+  extends ProvisionedResourceProperties,
+    VolumeProperties {}
 
 /** This type describes the properties of a network resource, including its kind. */
-export type NetworkResourcePropertiesBase = ProvisionedResourceProperties & {
+export interface NetworkResourcePropertiesBase
+  extends ProvisionedResourceProperties {
   /** The type of a Service Fabric container network. */
   kind: NetworkKind;
-};
+}
 
 /** This type describes properties of a gateway resource. */
-export type GatewayResourceProperties = ProvisionedResourceProperties &
-  GatewayProperties;
+export interface GatewayResourceProperties
+  extends ProvisionedResourceProperties,
+    GatewayProperties {}
 
 /** This type describes properties of a service resource. */
-export type ServiceResourceProperties = ProvisionedResourceProperties &
-  ServiceReplicaProperties &
-  ServiceProperties;
+export interface ServiceResourceProperties
+  extends ProvisionedResourceProperties,
+    ServiceReplicaProperties,
+    ServiceProperties {}
 
 /** This type describes properties of an application resource. */
-export type ApplicationResourceProperties = ProvisionedResourceProperties &
-  ApplicationProperties;
+export interface ApplicationResourceProperties
+  extends ProvisionedResourceProperties,
+    ApplicationProperties {}
 
 /** The resource model definition for Azure Resource Manager tracked top-level resource. */
-export type TrackedResource = Resource & {
+export interface TrackedResource extends Resource {
   /** Resource tags. */
   tags?: { [propertyName: string]: string };
   /** The geo-location where the resource lives */
   location: string;
-};
+}
 
 /** The resource model definition for Azure Resource Manager proxy resource. It will have everything other than required location and tags. */
-export type ProxyResource = Resource;
+export interface ProxyResource extends Resource {}
 
 /** Describes a replica of a service resource. */
-export type ServiceReplicaDescription = ServiceReplicaProperties & {
+export interface ServiceReplicaDescription extends ServiceReplicaProperties {
   /** Name of the replica. */
   replicaName: string;
-};
+}
 
 /** Describes a volume whose lifetime is scoped to the application's lifetime. */
-export type ApplicationScopedVolume = VolumeReference & {
+export interface ApplicationScopedVolume extends VolumeReference {
   /** Describes parameters for creating application-scoped volumes. */
   creationParameters: ApplicationScopedVolumeCreationParametersUnion;
-};
+}
 
 /** Describes parameters for creating application-scoped volumes provided by Service Fabric Volume Disks */
-export type ApplicationScopedVolumeCreationParametersServiceFabricVolumeDisk = ApplicationScopedVolumeCreationParameters & {
+export interface ApplicationScopedVolumeCreationParametersServiceFabricVolumeDisk
+  extends ApplicationScopedVolumeCreationParameters {
   /** Polymorphic discriminator, which specifies the different types this object can be */
   kind: "ServiceFabricVolumeDisk";
   /** Volume size */
   sizeDisk: SizeTypes;
-};
+}
 
 /** Describes the average load trigger used for auto scaling. */
-export type AverageLoadScalingTrigger = AutoScalingTrigger & {
+export interface AverageLoadScalingTrigger extends AutoScalingTrigger {
   /** Polymorphic discriminator, which specifies the different types this object can be */
   kind: "AverageLoad";
   /** Description of the metric that is used for scaling. */
@@ -751,10 +759,10 @@ export type AverageLoadScalingTrigger = AutoScalingTrigger & {
   upperLoadThreshold: number;
   /** Scale interval that indicates how often will this trigger be checked. */
   scaleIntervalInSeconds: number;
-};
+}
 
 /** Describes the horizontal auto scaling mechanism that adds or removes replicas (containers or container groups). */
-export type AddRemoveReplicaScalingMechanism = AutoScalingMechanism & {
+export interface AddRemoveReplicaScalingMechanism extends AutoScalingMechanism {
   /** Polymorphic discriminator, which specifies the different types this object can be */
   kind: "AddRemoveReplica";
   /** Minimum number of containers (scale down won't be performed below this number). */
@@ -763,10 +771,10 @@ export type AddRemoveReplicaScalingMechanism = AutoScalingMechanism & {
   maxCount: number;
   /** Each time auto scaling is performed, this number of containers will be added or removed. */
   scaleIncrement: number;
-};
+}
 
 /** This type describes a service resource. */
-export type ServiceResourceDescription = ManagedProxyResource & {
+export interface ServiceResourceDescription extends ManagedProxyResource {
   /**
    * State of the resource.
    * NOTE: This property will not be serialized. It can only be populated by the server.
@@ -806,10 +814,11 @@ export type ServiceResourceDescription = ManagedProxyResource & {
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly unhealthyEvaluation?: string;
-};
+}
 
 /** Diagnostics settings for Geneva. */
-export type AzureInternalMonitoringPipelineSinkDescription = DiagnosticsSinkProperties & {
+export interface AzureInternalMonitoringPipelineSinkDescription
+  extends DiagnosticsSinkProperties {
   /** Polymorphic discriminator, which specifies the different types this object can be */
   kind: "AzureInternalMonitoringPipeline";
   /** Azure Internal monitoring pipeline account. */
@@ -822,18 +831,18 @@ export type AzureInternalMonitoringPipelineSinkDescription = DiagnosticsSinkProp
   fluentdConfigUrl?: any;
   /** Azure Internal monitoring pipeline autokey associated with the certificate. */
   autoKeyConfigUrl?: string;
-};
+}
 
 /** Describes the resource that is used for triggering auto scaling. */
-export type AutoScalingResourceMetric = AutoScalingMetric & {
+export interface AutoScalingResourceMetric extends AutoScalingMetric {
   /** Polymorphic discriminator, which specifies the different types this object can be */
   kind: "Resource";
   /** Name of the resource. */
   name: AutoScalingResourceMetricName;
-};
+}
 
 /** Describes the properties of a secret resource. */
-export type SecretResourceProperties = SecretResourcePropertiesBase & {
+export interface SecretResourceProperties extends SecretResourcePropertiesBase {
   /** User readable description of the secret. */
   description?: string;
   /**
@@ -848,10 +857,11 @@ export type SecretResourceProperties = SecretResourcePropertiesBase & {
   readonly statusDetails?: string;
   /** The type of the content stored in the secret value. The value of this property is opaque to Service Fabric. Once set, the value of this property cannot be changed. */
   contentType?: string;
-};
+}
 
 /** Describes properties of a network resource. */
-export type NetworkResourceProperties = NetworkResourcePropertiesBase & {
+export interface NetworkResourceProperties
+  extends NetworkResourcePropertiesBase {
   /** User readable description of the network. */
   description?: string;
   /**
@@ -864,16 +874,16 @@ export type NetworkResourceProperties = NetworkResourcePropertiesBase & {
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly statusDetails?: string;
-};
+}
 
 /** This type describes a secret resource. */
-export type SecretResourceDescription = TrackedResource & {
+export interface SecretResourceDescription extends TrackedResource {
   /** Describes the properties of a secret resource. */
   properties: SecretResourcePropertiesUnion;
-};
+}
 
 /** This type describes a value of a secret resource. The name of this resource is the version identifier corresponding to this secret value. */
-export type SecretValueResourceDescription = TrackedResource & {
+export interface SecretValueResourceDescription extends TrackedResource {
   /**
    * State of the resource.
    * NOTE: This property will not be serialized. It can only be populated by the server.
@@ -881,10 +891,10 @@ export type SecretValueResourceDescription = TrackedResource & {
   readonly provisioningState?: string;
   /** The actual value of the secret. */
   value?: string;
-};
+}
 
 /** This type describes a volume resource. */
-export type VolumeResourceDescription = TrackedResource & {
+export interface VolumeResourceDescription extends TrackedResource {
   /**
    * State of the resource.
    * NOTE: This property will not be serialized. It can only be populated by the server.
@@ -906,16 +916,16 @@ export type VolumeResourceDescription = TrackedResource & {
   provider: VolumeProvider;
   /** This type describes a volume provided by an Azure Files file share. */
   azureFileParameters?: VolumeProviderParametersAzureFile;
-};
+}
 
 /** This type describes a network resource. */
-export type NetworkResourceDescription = TrackedResource & {
+export interface NetworkResourceDescription extends TrackedResource {
   /** Describes properties of a network resource. */
   properties: NetworkResourcePropertiesUnion;
-};
+}
 
 /** This type describes a gateway resource. */
-export type GatewayResourceDescription = TrackedResource & {
+export interface GatewayResourceDescription extends TrackedResource {
   /**
    * State of the resource.
    * NOTE: This property will not be serialized. It can only be populated by the server.
@@ -946,10 +956,10 @@ export type GatewayResourceDescription = TrackedResource & {
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly ipAddress?: string;
-};
+}
 
 /** This type describes an application resource. */
-export type ApplicationResourceDescription = TrackedResource & {
+export interface ApplicationResourceDescription extends TrackedResource {
   /**
    * State of the resource.
    * NOTE: This property will not be serialized. It can only be populated by the server.
@@ -988,16 +998,18 @@ export type ApplicationResourceDescription = TrackedResource & {
    * NOTE: This property will not be serialized. It can only be populated by the server.
    */
   readonly unhealthyEvaluation?: string;
-};
+}
 
 /** Describes the properties of a secret resource whose value is provided explicitly as plaintext. The secret resource may have multiple values, each being uniquely versioned. The secret value of each version is stored encrypted, and delivered as plaintext into the context of applications referencing it. */
-export type InlinedValueSecretResourceProperties = SecretResourceProperties;
+export interface InlinedValueSecretResourceProperties
+  extends SecretResourceProperties {}
 
 /** Information about a Service Fabric container network local to a single Service Fabric cluster. */
-export type LocalNetworkResourceProperties = NetworkResourceProperties & {
+export interface LocalNetworkResourceProperties
+  extends NetworkResourceProperties {
   /** Address space for the local container network. */
   networkAddressPrefix?: string;
-};
+}
 
 /** Known values of {@link ResourceStatus} that the service accepts. */
 export enum KnownResourceStatus {
@@ -1032,7 +1044,7 @@ export type ResourceStatus = string;
 /** Known values of {@link SecretKind} that the service accepts. */
 export enum KnownSecretKind {
   /** A simple secret resource whose plaintext value is provided by the user. */
-  InlinedValue = "inlinedValue"
+  InlinedValue = "InlinedValue"
 }
 
 /**
@@ -1040,7 +1052,7 @@ export enum KnownSecretKind {
  * {@link KnownSecretKind} can be used interchangeably with SecretKind,
  *  this enum contains the known values that the service supports.
  * ### Known values supported by the service
- * **inlinedValue**: A simple secret resource whose plaintext value is provided by the user.
+ * **InlinedValue**: A simple secret resource whose plaintext value is provided by the user.
  */
 export type SecretKind = string;
 
@@ -1076,6 +1088,7 @@ export type NetworkKind = string;
 
 /** Known values of {@link PathMatchType} that the service accepts. */
 export enum KnownPathMatchType {
+  /** Prefix */
   Prefix = "prefix"
 }
 
@@ -1090,6 +1103,7 @@ export type PathMatchType = string;
 
 /** Known values of {@link HeaderMatchType} that the service accepts. */
 export enum KnownHeaderMatchType {
+  /** Exact */
   Exact = "exact"
 }
 
@@ -1212,8 +1226,11 @@ export type DiagnosticsSinkKind = string;
 
 /** Known values of {@link SizeTypes} that the service accepts. */
 export enum KnownSizeTypes {
+  /** Small */
   Small = "Small",
+  /** Medium */
   Medium = "Medium",
+  /** Large */
   Large = "Large"
 }
 
diff --git a/sdk/servicefabricmesh/arm-servicefabricmesh/src/serviceFabricMeshManagementClient.ts b/sdk/servicefabricmesh/arm-servicefabricmesh/src/serviceFabricMeshManagementClient.ts
index da40a4797193..5c7a031e1743 100644
--- a/sdk/servicefabricmesh/arm-servicefabricmesh/src/serviceFabricMeshManagementClient.ts
+++ b/sdk/servicefabricmesh/arm-servicefabricmesh/src/serviceFabricMeshManagementClient.ts
@@ -148,7 +148,7 @@ export class ServiceFabricMeshManagementClient extends coreClient.ServiceClient
         if (param.length > 1) {
           const newParams = param[1].split("&").map((item) => {
             if (item.indexOf("api-version") > -1) {
-              return item.replace(/(?<==).*$/, apiVersion);
+              return "api-version=" + apiVersion;
             } else {
               return item;
             }
diff --git a/sdk/servicefabricmesh/arm-servicefabricmesh/tsconfig.json b/sdk/servicefabricmesh/arm-servicefabricmesh/tsconfig.json
index b352b9a4ca89..3e6ae96443f3 100644
--- a/sdk/servicefabricmesh/arm-servicefabricmesh/tsconfig.json
+++ b/sdk/servicefabricmesh/arm-servicefabricmesh/tsconfig.json
@@ -15,17 +15,11 @@
     ],
     "declaration": true,
     "outDir": "./dist-esm",
-    "importHelpers": true,
-    "paths": {
-      "@azure/arm-servicefabricmesh": [
-        "./src/index"
-      ]
-    }
+    "importHelpers": true
   },
   "include": [
     "./src/**/*.ts",
-    "./test/**/*.ts",
-    "samples-dev/**/*.ts"
+    "./test/**/*.ts"
   ],
   "exclude": [
     "node_modules"